Fixes requirements

Author: Mark Jan van Kampen

recipes/rapidcheck/all/conanfile.py

@@ -94,9 +94,9 @@ def package(self):
         self._create_cmake_module_alias_targets(
             os.path.join(self.package_folder, self._module_file_rel_path),
             {"rapidcheck": "rapidcheck::rapidcheck", 
-             "rapidcheck_catch":"rapidcheck::catch", 
-             "rapidcheck_gmock": "rapidcheck::gmock", 
-             "rapidcheck_gtest": "rapidcheck::gtest"}
+             "rapidcheck_catch":"rapidcheck::rapidcheck_catch", 
+             "rapidcheck_gmock": "rapidcheck::rapidcheck_gmock", 
+             "rapidcheck_gtest": "rapidcheck::rapidcheck_gtest"}
         )
 
     @staticmethod
@@ -137,12 +137,9 @@ def package_info(self):
                 self.cpp_info.components["core"].defines.append("RC_DONT_USE_RTTI")
 
         if self.options.enable_catch:
-            self.cpp_info.components["core"].requires.append("catch2::catch2")
-            self.cpp_info.components["catch"].requires = ["core", "catch2::catch2"]
+            self.cpp_info.components["rapidcheck_catch"].requires = ["core", "catch2::catch2"]
         if self.options.enable_gmock:
-            self.cpp_info.components["core"].requires.append("gtest::gtest")
-            self.cpp_info.components["gmock"].requires = ["core"]
+            self.cpp_info.components["rapidcheck_gmock"].requires = ["core", "gtest::gtest"]
         if self.options.enable_gtest:
-            self.cpp_info.components["core"].requires.append("gtest::gtest")
-            self.cpp_info.components["gtest"].requires = ["core"]
+            self.cpp_info.components["rapidcheck_gtest"].requires = ["core", "gtest::gtest"]
 

recipes/rapidcheck/all/patches/0001-gtest-catch-integration-20200131.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 92bc63c7df2cb87b5e5672a7651dbb4eafa3aaa7..c57b700157360f4b5a2e280167e821f567bb31ea 100644
+index 92bc63c7df2cb87b5e5672a7651dbb4eafa3aaa7..14000896cd4e6ebcde3f2154b85caf4f5cca056b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -106,8 +106,6 @@ if(RC_ENABLE_RTTI)
@@ -11,20 +11,3 @@ index 92bc63c7df2cb87b5e5672a7651dbb4eafa3aaa7..c57b700157360f4b5a2e280167e821f5
  if(RC_ENABLE_TESTS)
    enable_testing()
    add_subdirectory(test)
-@@ -117,6 +115,16 @@ if(RC_ENABLE_EXAMPLES)
-   add_subdirectory(examples)
- endif()
- 
-+if (RC_ENABLE_CATCH)
-+	find_package(Catch2 REQUIRED)
-+	target_link_libraries(rapidcheck PUBLIC Catch2::Catch2)
-+endif()
-+
-+if (RC_ENABLE_GMOCK OR RC_ENABLE_GTEST)
-+	find_package(GTest REQUIRED)
-+	target_link_libraries(rapidcheck PUBLIC GTest::GTest)
-+endif()
-+
- add_subdirectory(extras)
- 
- # Install the export file specifying all the targets for RapidCheck

recipes/rapidcheck/all/patches/0001-gtest-catch-integration-20210107.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f583afc171fab0a6894ffd64a0c787fd806bbaa..da2389500c99e4e4b59c772ee25285e2a9607de5 100644
+index 9f583afc171fab0a6894ffd64a0c787fd806bbaa..ea31145f55fe1010fe36739c17a655309db552f1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -106,8 +106,6 @@ if(NOT RC_ENABLE_RTTI)
@@ -11,19 +11,3 @@ index 9f583afc171fab0a6894ffd64a0c787fd806bbaa..da2389500c99e4e4b59c772ee25285e2
  if(RC_ENABLE_TESTS)
    enable_testing()
    add_subdirectory(test)
-@@ -116,6 +114,15 @@ endif()
- if(RC_ENABLE_EXAMPLES)
-   add_subdirectory(examples)
- endif()
-+if (RC_ENABLE_CATCH)
-+	find_package(Catch2 REQUIRED)
-+	target_link_libraries(rapidcheck PUBLIC Catch2::Catch2)
-+endif()
-+
-+if (RC_ENABLE_GMOCK OR RC_ENABLE_GTEST)
-+	find_package(GTest REQUIRED)
-+	target_link_libraries(rapidcheck PUBLIC GTest::GTest)
-+endif()
- 
- add_subdirectory(extras)
- 

recipes/rapidcheck/all/patches/0001-gtest-catch-integration.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15c46d01288dce235179b791770187f5a38230ab..0c47308162af09841789ff9791b11839d524f852 100644
+index 15c46d01288dce235179b791770187f5a38230ab..1805354a744931086622c41fa5a640c283142adc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -111,8 +111,6 @@ if(NOT RC_ENABLE_RTTI)
@@ -11,20 +11,3 @@ index 15c46d01288dce235179b791770187f5a38230ab..0c47308162af09841789ff9791b11839
  if(RC_ENABLE_TESTS)
    enable_testing()
    add_subdirectory(test)
-@@ -122,6 +120,16 @@ if(RC_ENABLE_EXAMPLES)
-   add_subdirectory(examples)
- endif()
- 
-+if (RC_ENABLE_CATCH)
-+	find_package(Catch2 REQUIRED)
-+	target_link_libraries(rapidcheck PUBLIC Catch2::Catch2)
-+endif()
-+
-+if (RC_ENABLE_GMOCK OR RC_ENABLE_GTEST)
-+	find_package(GTest REQUIRED)
-+	target_link_libraries(rapidcheck PUBLIC GTest::GTest)
-+endif()
-+
- add_subdirectory(extras)
- 
- # Install the export file specifying all the targets for RapidCheck