From 9caa30f84616e3373c96b7bbc13343402de4798e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 27 Apr 2018 22:47:27 +0200 Subject: [PATCH] Fix TestPaint target Adds missing files to target --- test/testpaint/CMakeLists.txt | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt index 0f9ed9aaf0..1d362a9706 100644 --- a/test/testpaint/CMakeLists.txt +++ b/test/testpaint/CMakeLists.txt @@ -54,15 +54,28 @@ endif () set(OPENRCT2_SRCPATH "${ROOT_DIR}/src/openrct2") file(GLOB_RECURSE ORCT2_RIDE_SOURCES "${OPENRCT2_SRCPATH}/ride/*/*.cpp") -file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/RideData.cpp" - "${OPENRCT2_SRCPATH}/ride/TrackData.cpp" - "${OPENRCT2_SRCPATH}/ride/TrackDataOld.cpp" - "${OPENRCT2_SRCPATH}/ride/TrackPaint.cpp" - "${OPENRCT2_SRCPATH}/rct2/addresses.c" - "${OPENRCT2_SRCPATH}/Diagnostic.cpp" - "${OPENRCT2_SRCPATH}/rct2/hook.c" - "${OPENRCT2_SRCPATH}/paint/tile_element/TileElement.cpp" - "${OPENRCT2_SRCPATH}/paint/PaintHelpers.cpp") +file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES + "${OPENRCT2_SRCPATH}/Diagnostic.cpp" + "${OPENRCT2_SRCPATH}/paint/PaintHelpers.cpp" + "${OPENRCT2_SRCPATH}/paint/tile_element/TileElement.cpp" + "${OPENRCT2_SRCPATH}/rct2/addresses.c" + "${OPENRCT2_SRCPATH}/rct2/hook.c" + "${OPENRCT2_SRCPATH}/ride/RideData.cpp" + "${OPENRCT2_SRCPATH}/ride/TrackData.cpp" + "${OPENRCT2_SRCPATH}/ride/TrackDataOld.cpp" + "${OPENRCT2_SRCPATH}/ride/TrackPaint.cpp" + "${ROOT_DIR}/src/openrct2/core/Console.cpp" + "${ROOT_DIR}/src/openrct2/core/Diagnostics.cpp" + "${ROOT_DIR}/src/openrct2/core/Guard.cpp" + "${ROOT_DIR}/src/openrct2/core/String.cpp" + "${ROOT_DIR}/src/openrct2/Diagnostic.cpp" + "${ROOT_DIR}/src/openrct2/localisation/ConversionTables.cpp" + "${ROOT_DIR}/src/openrct2/localisation/Convert.cpp" + "${ROOT_DIR}/src/openrct2/localisation/FormatCodes.cpp" + "${ROOT_DIR}/src/openrct2/localisation/UTF8.cpp" + "${ROOT_DIR}/src/openrct2/util/Util.cpp" + "${ROOT_DIR}/src/openrct2/Version.cpp" +) file(GLOB_RECURSE ORCT2_TESTPAINT_SOURCES "${CMAKE_CURRENT_LIST_DIR}/*.c" "${CMAKE_CURRENT_LIST_DIR}/*.cpp" "${CMAKE_CURRENT_LIST_DIR}/*.h") @@ -73,6 +86,7 @@ set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/addresses.c PROPERTIES COM add_executable(testpaint EXCLUDE_FROM_ALL ${ORCT2_RIDE_SOURCES} ${ORCT2_RIDE_DEP_SOURCES} ${ORCT2_TESTPAINT_SOURCES} ${RCT2_SECTIONS}) target_include_directories(testpaint PRIVATE "${ROOT_DIR}/src/") +target_link_libraries(testpaint z) set_target_properties(testpaint PROPERTIES COMPILE_FLAGS "-DNO_VEHICLES -D__TESTPAINT__ -Wno-unused") set_target_properties(testpaint PROPERTIES LINK_FLAGS ${RCT2_SEGMENT_LINKER_FLAGS})