diff --git a/.appveyor.yml b/.appveyor.yml index 0092b763..5de0caaa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -37,7 +37,7 @@ build: build_script: - mkdir build - cd build - - cmake -DGTEST_FORCE_SHARED_CRT=ON .. + - cmake .. - cmake --build . test_script: diff --git a/cmake/AddGoogletest.cmake b/cmake/AddGoogletest.cmake index 67993884..a70fbdb5 100644 --- a/cmake/AddGoogletest.cmake +++ b/cmake/AddGoogletest.cmake @@ -56,6 +56,7 @@ macro(add_gtest TESTNAME) debug ${GTEST_LIBS_DIR}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_FIND_LIBRARY_SUFFIXES} optimized ${GTEST_LIBS_DIR}/ReleaseLibs/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_FIND_LIBRARY_SUFFIXES} ) + target_include_directories(${TESTNAME} PUBLIC ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}) endif() target_link_libraries(${TESTNAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT}) add_test(${TESTNAME} ${TESTNAME})