MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
develop
Myk Taylor 2022-11-30 05:34:39 -08:00
parent 5e745e2295
commit 5d08a0f765
No known key found for this signature in database
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -423,10 +423,12 @@ add_subdirectory(depends)
# Testing with CTest # Testing with CTest
macro(dfhack_test name files) macro(dfhack_test name files)
if(UNIX) # remove this once our MSVC build env has been updated
add_executable(${name} ${files}) add_executable(${name} ${files})
target_include_directories(${name} PUBLIC depends/googletest/googletest/include) target_include_directories(${name} PUBLIC depends/googletest/googletest/include)
target_link_libraries(${name} dfhack gtest SDL) target_link_libraries(${name} dfhack gtest SDL)
add_test(NAME ${name} COMMAND ${name}) add_test(NAME ${name} COMMAND ${name})
endif()
endmacro() endmacro()
include(CTest) include(CTest)

2
depends/CMakeLists.txt
Unescape Escape View File

@ -4,11 +4,13 @@ add_subdirectory(lua)
add_subdirectory(md5) add_subdirectory(md5)
add_subdirectory(protobuf) 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) option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF)
add_subdirectory(googletest) add_subdirectory(googletest)
if(UNIX) if(UNIX)
set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized -Wno-sign-compare") set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized -Wno-sign-compare")
endif() endif()
endif()
# Don't build tinyxml if it's being externally linked against. # Don't build tinyxml if it's being externally linked against.
if(NOT TinyXML_FOUND) if(NOT TinyXML_FOUND)