diff options
| author | Ram Mohan <ram.mohan@ittiam.com> | 2023-10-27 21:22:33 +0530 |
|---|---|---|
| committer | Ram Mohan M <ram.mohan@ittiam.com> | 2023-11-02 04:47:42 +0530 |
| commit | 32c10f224fc29791c6a7a6b755faaf1365cbbb53 (patch) | |
| tree | 8cb754d6c3ca5d6168c9ea4897227fb5453fb5aa | |
| parent | d1ad9a00076ec1ae593d0957f87a2d5921fc852d (diff) | |
| download | libultrahdr-32c10f224fc29791c6a7a6b755faaf1365cbbb53.tar.gz | |
fix build issue when unit tests are enabled
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b316d5..d209262 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,8 +105,8 @@ function(fetch_googletest) INSTALL_COMMAND "" ) set(GTEST_INCLUDE_DIRS - ${CMAKE_CURRENT_BINARY_DIR}/googletest/googletest/include - ${CMAKE_CURRENT_BINARY_DIR}/googletest/googlemock/include PARENT_SCOPE) + ${SRC_DIR}/third_party/googletest/googletest/include + ${SRC_DIR}/third_party/googletest/googlemock/include PARENT_SCOPE) set(GTEST_BOTH_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest-build/lib/libgtest.a ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest-build/lib/libgtest_main.a PARENT_SCOPE) @@ -119,10 +119,7 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES fetch_libjpegturbo() if(${ENABLE_TESTS}) - find_package(GTest) - if(NOT GTest_FOUND) - fetch_googletest() - endif() + fetch_googletest() endif() add_library(ultrahdr STATIC @@ -193,11 +190,7 @@ if(${ENABLE_TESTS}) ${GTEST_INCLUDE_DIRS} "${SRC_DIR}/include" ) - if(GTest_FOUND) - add_dependencies(ultrahdr_unit_test libjpeg-turbo) - else() - add_dependencies(ultrahdr_unit_test googletest libjpeg-turbo) - endif() + add_dependencies(ultrahdr_unit_test googletest libjpeg-turbo) target_link_libraries(ultrahdr_unit_test ${GTEST_BOTH_LIBRARIES}) |