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

remove unnecessary target modifications

develop
myk002 2022-11-28 17:40:06 -08:00
parent 88074dacf0
commit d0a6a3e930
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
Unescape Escape View File

@ -426,8 +426,7 @@ macro(dfhack_test name files)
message("dfhack_test(${name}, ${files})") message("dfhack_test(${name}, ${files})")
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) target_link_libraries(${name} dfhack gtest SDL)
set_target_properties(${name} PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
add_test(NAME ${name} COMMAND ${name}) add_test(NAME ${name} COMMAND ${name})
endmacro() endmacro()
include(CTest) include(CTest)
@ -544,7 +543,7 @@ if(BUILD_TESTS)
message(SEND_ERROR "test/scripts must not exist in the dfhack repo since it would conflict with the tests installed from the scripts repo.") message(SEND_ERROR "test/scripts must not exist in the dfhack repo since it would conflict with the tests installed from the scripts repo.")
endif() endif()
install(DIRECTORY ${dfhack_SOURCE_DIR}/test install(DIRECTORY ${dfhack_SOURCE_DIR}/test
DESTINATION ${DFHACK_DATA_DESTINATION}/scripts) DESTINATION ${DFHACK_DATA_DESTINATION}/scripts)
install(FILES ci/test.lua DESTINATION ${DFHACK_DATA_DESTINATION}/scripts) install(FILES ci/test.lua DESTINATION ${DFHACK_DATA_DESTINATION}/scripts)
endif() endif()

2
library/CMakeLists.txt
Unescape Escape View File

@ -397,8 +397,6 @@ if(APPLE)
target_link_libraries(dfhack ncurses) target_link_libraries(dfhack ncurses)
set_target_properties(dfhack PROPERTIES VERSION 1.0.0) set_target_properties(dfhack PROPERTIES VERSION 1.0.0)
set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0) set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0)
elseif(UNIX)
target_link_libraries(dfhack SDL)
endif() endif()
target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_static dfhack-version ${PROJECT_LIBS}) target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_static dfhack-version ${PROJECT_LIBS})