projects / packages / elektra.git / blame
| Commit | Line | Data |
|---|---|---|
| dad55a17 JB |
1 | --- elektra-0.8.26/tests/CMakeLists.txt.orig 2019-02-26 12:45:46.000000000 +0100 |
| 2 | +++ elektra-0.8.26/tests/CMakeLists.txt 2022-07-06 20:43:06.457706947 +0200 | |
| 3 | @@ -12,38 +12,8 @@ include (LibAddMacros) | |
| 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) | |
| 15 | - if (CMAKE_VERSION VERSION_LESS 3.2) | |
| 16 | - set (UPDATE_DISCONNECTED_IF_AVAILABLE "") | |
| 17 | - else () | |
| 18 | - set (UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1") | |
| 19 | - endif () | |
| 20 | - | |
| 21 | - download_project (PROJ googletest | |
| 22 | - GIT_REPOSITORY https://github.com/google/googletest.git | |
| 23 | - GIT_TAG release-1.8.1 | |
| 24 | - QUIET | |
| 25 | - ${UPDATE_DISCONNECTED_IF_AVAILABLE}) | |
| 26 | - endif (DEFINED GOOGLETEST_ROOT) | |
| 27 | - | |
| 28 | - # Prevent GoogleTest from overriding our compiler/linker options when building with Visual Studio | |
| 29 | - set (gtest_force_shared_crt | |
| 30 | - ON | |
| 31 | - CACHE BOOL | |
| 32 | - "" | |
| 33 | - FORCE) | |
| 34 | - | |
| 35 | - add_subdirectory (${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) | |
| 36 | - | |
| 37 | - set_property (TARGET gtest | |
| 38 | - PROPERTY COMPILE_FLAGS | |
| 39 | - "-Wno-undef") | |
| 40 | endif (ENABLE_TESTING) | |
| 41 | ||
| 42 | # don't call add_headers in a loop | |
| 43 | --- elektra-0.8.26/cmake/Modules/LibAddPlugin.cmake.orig 2019-02-26 12:45:46.000000000 +0100 | |
| 44 | +++ elektra-0.8.26/cmake/Modules/LibAddPlugin.cmake 2022-07-06 21:58:10.920432262 +0200 | |
| 45 | @@ -183,7 +183,7 @@ function (add_plugintest testname) | |
| 46 | target_link_elektra (${testexename} elektra-kdb elektra-plugin ${ARG_LINK_ELEKTRA} ${ARG_TEST_LINK_ELEKTRA}) | |
| 47 | ||
| 48 | if (ARG_CPP) | |
| 49 | - target_link_libraries (${testexename} gtest_main) | |
| 50 | + target_link_libraries (${testexename} gtest_main gtest) | |
| 51 | endif (ARG_CPP) | |
| 52 | ||
| 53 | set_additional_compile_definitions (${testname}) |