Commit d108d65b82eb3c8da4b2f15fcae4e7d5aceea9cc

Authored by Henry Fredrick Schreiner
1 parent cef1517f

Fixing linker errors using example

Showing 1 changed file with 3 additions and 18 deletions
cmake/AddGoogletest.cmake
@@ -4,8 +4,7 @@ @@ -4,8 +4,7 @@
4 # gives output on failed tests without having to set an environment variable. 4 # gives output on failed tests without having to set an environment variable.
5 # 5 #
6 # 6 #
7 -  
8 -find_package(Threads REQUIRED) 7 +set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1")
9 8
10 include(DownloadProject) 9 include(DownloadProject)
11 download_project(PROJ googletest 10 download_project(PROJ googletest
@@ -15,6 +14,7 @@ download_project(PROJ googletest @@ -15,6 +14,7 @@ download_project(PROJ googletest
15 QUIET 14 QUIET
16 ) 15 )
17 16
  17 +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
18 18
19 add_subdirectory(${googletest_SOURCE_DIR} ${googletest_SOURCE_DIR}) 19 add_subdirectory(${googletest_SOURCE_DIR} ${googletest_SOURCE_DIR})
20 20
@@ -43,22 +43,7 @@ endif() @@ -43,22 +43,7 @@ endif()
43 43
44 # Target must already exist 44 # Target must already exist
45 macro(add_gtest TESTNAME) 45 macro(add_gtest TESTNAME)
46 - if(NOT WIN32 OR MINGW)  
47 - target_link_libraries(${TESTNAME} PUBLIC gtest gmock gtest_main)  
48 - else()  
49 - target_link_libraries(${TESTNAME} PUBLIC  
50 - debug ${GMOCK_LIBS_DIR}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${CMAKE_FIND_LIBRARY_SUFFIXES}  
51 - optimized ${GMOCK_LIBS_DIR}/ReleaseLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${CMAKE_FIND_LIBRARY_SUFFIXES}  
52 -  
53 - debug ${GTEST_LIBS_DIR}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_FIND_LIBRARY_SUFFIXES}  
54 - optimized ${GTEST_LIBS_DIR}/ReleaseLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_FIND_LIBRARY_SUFFIXES}  
55 -  
56 - debug ${GTEST_LIBS_DIR}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_FIND_LIBRARY_SUFFIXES}  
57 - optimized ${GTEST_LIBS_DIR}/ReleaseLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_FIND_LIBRARY_SUFFIXES}  
58 - )  
59 - target_include_directories(${TESTNAME} PUBLIC ${gmock_SOURCE_DIR}/include ${gtest_SOURCE_DIR}/include)  
60 - endif()  
61 - target_link_libraries(${TESTNAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT}) 46 + target_link_libraries(${TESTNAME} PUBLIC gtest gmock gtest_main)
62 add_test(${TESTNAME} ${TESTNAME}) 47 add_test(${TESTNAME} ${TESTNAME})
63 endmacro() 48 endmacro()
64 49