]>
Commit | Line | Data |
---|---|---|
58b803e9 JB |
1 | --- elektra-0.9.14/tests/CMakeLists.txt.orig 2023-08-25 20:31:59.347103750 +0200 |
2 | +++ elektra-0.9.14/tests/CMakeLists.txt 2023-08-25 20:32:56.280128651 +0200 | |
3 | @@ -12,30 +12,8 @@ include (LibAddMacros) | |
dad55a17 JB |
4 | |
5 | if (ENABLE_TESTING) | |
6 | ||
7 | - include (FindGTest) | |
8 | + find_package (GTest) | |
9 | ||
10 | - if (DEFINED GOOGLETEST_ROOT) | |
11 | - set (googletest_SOURCE_DIR "${GOOGLETEST_ROOT}") | |
12 | - set (googletest_BINARY_DIR "${CMAKE_BINARY_DIR}/gtest") | |
13 | - else (DEFINED GOOGLETEST_ROOT) | |
14 | - include (DownloadProject) | |
dad55a17 | 15 | - |
58b803e9 JB |
16 | - download_project ( |
17 | - PROJ googletest | |
18 | - GIT_REPOSITORY https://github.com/google/googletest.git | |
19 | - GIT_TAG release-1.12.1 QUIET UPDATE_DISCONNECTED 1) | |
dad55a17 JB |
20 | - endif (DEFINED GOOGLETEST_ROOT) |
21 | - | |
22 | - # Prevent GoogleTest from overriding our compiler/linker options when building with Visual Studio | |
58b803e9 JB |
23 | - set ( |
24 | - gtest_force_shared_crt | |
25 | - ON | |
26 | - CACHE BOOL "" FORCE) | |
dad55a17 JB |
27 | - |
28 | - add_subdirectory (${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) | |
29 | - | |
58b803e9 JB |
30 | - set_property (TARGET gtest PROPERTY COMPILE_FLAGS "-Wno-undef") |
31 | - set_property (TARGET gtest_main PROPERTY COMPILE_FLAGS "-Wno-undef") | |
dad55a17 JB |
32 | endif (ENABLE_TESTING) |
33 | ||
34 | # don't call add_headers in a loop | |
58b803e9 JB |
35 | --- elektra-0.9.14/scripts/cmake/Modules/LibAddPlugin.cmake.orig 2019-02-26 12:45:46.000000000 +0100 |
36 | +++ elektra-0.9.14/scripts/cmake/Modules/LibAddPlugin.cmake 2022-07-06 21:58:10.920432262 +0200 | |
dad55a17 JB |
37 | @@ -183,7 +183,7 @@ function (add_plugintest testname) |
38 | target_link_elektra (${testexename} elektra-kdb elektra-plugin ${ARG_LINK_ELEKTRA} ${ARG_TEST_LINK_ELEKTRA}) | |
39 | ||
40 | if (ARG_CPP) | |
41 | - target_link_libraries (${testexename} gtest_main) | |
42 | + target_link_libraries (${testexename} gtest_main gtest) | |
43 | endif (ARG_CPP) | |
44 | ||
45 | set_additional_compile_definitions (${testname}) |