From 5d08a0f765f07481654a026d83a2fd3058a2b777 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 30 Nov 2022 05:34:39 -0800 Subject: [PATCH] skip unit tests on windows until build env updated otherwise we get fatal error C1902: Program database manager mismatch; please check your installation revert this commit once windows is updated --- CMakeLists.txt | 2 ++ depends/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e179417da..d189847a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -423,10 +423,12 @@ add_subdirectory(depends) # Testing with CTest macro(dfhack_test name files) +if(UNIX) # remove this once our MSVC build env has been updated add_executable(${name} ${files}) target_include_directories(${name} PUBLIC depends/googletest/googletest/include) target_link_libraries(${name} dfhack gtest SDL) add_test(NAME ${name} COMMAND ${name}) +endif() endmacro() include(CTest) diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index 0238464c7..91d468fd8 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -4,11 +4,13 @@ add_subdirectory(lua) add_subdirectory(md5) add_subdirectory(protobuf) +if(UNIX) # remove this once our MSVC build env has been updated option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF) add_subdirectory(googletest) if(UNIX) set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized -Wno-sign-compare") endif() +endif() # Don't build tinyxml if it's being externally linked against. if(NOT TinyXML_FOUND)