Skip to content

Commit a3eb3a4

Browse files
author
Mark Jan van Kampen
committed
Fixes older versions
1 parent 1b52785 commit a3eb3a4

File tree

3 files changed

+61
-2
lines changed

3 files changed

+61
-2
lines changed

recipes/rapidcheck/all/conandata.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ patches:
1313
- patch_file: "patches/0001-gtest-catch-integration.patch"
1414
base_path: "source_subfolder"
1515
"cci.20210107":
16-
- patch_file: "patches/0001-gtest-catch-integration.patch"
16+
- patch_file: "patches/0001-gtest-catch-integration-20210107.patch"
1717
base_path: "source_subfolder"
1818
"cci.20200131":
19-
- patch_file: "patches/0001-gtest-catch-integration.patch"
19+
- patch_file: "patches/0001-gtest-catch-integration-20200131.patch"
2020
base_path: "source_subfolder"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 92bc63c7df2cb87b5e5672a7651dbb4eafa3aaa7..c57b700157360f4b5a2e280167e821f567bb31ea 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -106,8 +106,6 @@ if(RC_ENABLE_RTTI)
6+
target_compile_definitions(rapidcheck PUBLIC RC_USE_RTTI)
7+
endif()
8+
9+
-add_subdirectory(ext)
10+
-
11+
if(RC_ENABLE_TESTS)
12+
enable_testing()
13+
add_subdirectory(test)
14+
@@ -117,6 +115,16 @@ if(RC_ENABLE_EXAMPLES)
15+
add_subdirectory(examples)
16+
endif()
17+
18+
+if (RC_ENABLE_CATCH)
19+
+ find_package(Catch2 REQUIRED)
20+
+ target_link_libraries(rapidcheck PUBLIC Catch2::Catch2)
21+
+endif()
22+
+
23+
+if (RC_ENABLE_GMOCK OR RC_ENABLE_GTEST)
24+
+ find_package(GTest REQUIRED)
25+
+ target_link_libraries(rapidcheck PUBLIC GTest::GTest)
26+
+endif()
27+
+
28+
add_subdirectory(extras)
29+
30+
# Install the export file specifying all the targets for RapidCheck
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 9f583afc171fab0a6894ffd64a0c787fd806bbaa..da2389500c99e4e4b59c772ee25285e2a9607de5 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -106,8 +106,6 @@ if(NOT RC_ENABLE_RTTI)
6+
target_compile_definitions(rapidcheck PUBLIC RC_DONT_USE_RTTI)
7+
endif()
8+
9+
-add_subdirectory(ext)
10+
-
11+
if(RC_ENABLE_TESTS)
12+
enable_testing()
13+
add_subdirectory(test)
14+
@@ -116,6 +114,15 @@ endif()
15+
if(RC_ENABLE_EXAMPLES)
16+
add_subdirectory(examples)
17+
endif()
18+
+if (RC_ENABLE_CATCH)
19+
+ find_package(Catch2 REQUIRED)
20+
+ target_link_libraries(rapidcheck PUBLIC Catch2::Catch2)
21+
+endif()
22+
+
23+
+if (RC_ENABLE_GMOCK OR RC_ENABLE_GTEST)
24+
+ find_package(GTest REQUIRED)
25+
+ target_link_libraries(rapidcheck PUBLIC GTest::GTest)
26+
+endif()
27+
28+
add_subdirectory(extras)
29+

0 commit comments

Comments
 (0)