From df7cdd4b8e1bf30292b7a54e68aa636683daa78c Mon Sep 17 00:00:00 2001 From: MrSimbax Date: Tue, 14 Jul 2020 13:51:07 +0200 Subject: [PATCH] Fix some minor issues after CR --- src/CMakeLists.txt | 3 +-- test/cbot/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a3ce5527..1b71851d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ # Compile flags as defined in global CMakeLists -# Todo: replace with target properties set(CMAKE_CXX_FLAGS "${COLOBOT_CXX_FLAGS} ${MXE_CFLAGS}") set(CMAKE_CXX_FLAGS_RELEASE ${COLOBOT_CXX_FLAGS_RELEASE}) set(CMAKE_CXX_FLAGS_DEBUG ${COLOBOT_CXX_FLAGS_DEBUG}) @@ -519,7 +518,7 @@ elseif(PLATFORM_WINDOWS) if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if(BUILD_STATIC) find_package(Intl REQUIRED) - #todo figure out why those dependencies are needed and find them in a better way + # TODO: figure out why those dependencies are needed and find/link them in a better way find_library(BZ2_LIBRARY NAMES bz2.lib) find_library(JPEG_LIBRARY NAMES jpeg.lib) find_library(TIFF_LIBRARY NAMES tiff.lib) diff --git a/test/cbot/CMakeLists.txt b/test/cbot/CMakeLists.txt index 473f3d73..f8c0010a 100644 --- a/test/cbot/CMakeLists.txt +++ b/test/cbot/CMakeLists.txt @@ -3,7 +3,10 @@ target_link_directories(CBot_console PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) -target_link_libraries(CBot_console PRIVATE CBot colobotbase) +target_link_libraries(CBot_console PRIVATE + CBot + colobotbase # Needed for error strings (TODO: why are they on Colobot side? :/) +) add_executable(CBot_compile_graph compile_graph.cpp) target_link_directories(CBot_compile_graph PRIVATE