From e9fe24639a7da08b4d4b9fb5d8ac671e4c452b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Mon, 5 Apr 2021 17:59:28 +0200 Subject: [PATCH] cmake - Modern use of consuming gtest --- unitTests/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt index 331c1278..bef0e2f5 100644 --- a/unitTests/CMakeLists.txt +++ b/unitTests/CMakeLists.txt @@ -53,11 +53,11 @@ target_include_directories(unit_tests ${exiv2lib_INCLUDE_DIRECTORIES} ) -#TODO Use GTest::GTest once we upgrade the minimum CMake version required target_link_libraries(unit_tests PRIVATE ${exiv2lib_LINK_LIBRARIES} - ${GTEST_BOTH_LIBRARIES} + GTest::GTest + GTest::Main ) # ZLIB is used in exiv2lib_int. @@ -71,11 +71,6 @@ target_include_directories(unit_tests ${CMAKE_SOURCE_DIR}/src ) -target_compile_definitions(unit_tests - PRIVATE - GTEST_LINKED_AS_SHARED_LIBRARY=1 -) - set_target_properties(unit_tests PROPERTIES COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS} )