From d0a6a3e930c7309b4bf2ef5d8e56993719f17b76 Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 28 Nov 2022 17:40:06 -0800 Subject: [PATCH] remove unnecessary target modifications --- CMakeLists.txt | 5 ++--- library/CMakeLists.txt | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2b123120..9fde3e8f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,8 +426,7 @@ macro(dfhack_test name files) message("dfhack_test(${name}, ${files})") add_executable(${name} ${files}) target_include_directories(${name} PUBLIC depends/googletest/googletest/include) - target_link_libraries(${name} dfhack gtest) - set_target_properties(${name} PROPERTIES COMPILE_FLAGS "-Wno-sign-compare") + target_link_libraries(${name} dfhack gtest SDL) add_test(NAME ${name} COMMAND ${name}) endmacro() 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.") endif() 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) endif() diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index d53f098f8..aee5184c8 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -397,8 +397,6 @@ if(APPLE) target_link_libraries(dfhack ncurses) set_target_properties(dfhack PROPERTIES VERSION 1.0.0) set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0) -elseif(UNIX) - target_link_libraries(dfhack SDL) endif() target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_static dfhack-version ${PROJECT_LIBS})