From ea6f67f87cda156577261ec06798780f314f1408 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 13 Apr 2019 13:48:46 +0100 Subject: [PATCH] CMake fixes --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 533f4422..6b68ae7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,31 +219,33 @@ set(RESOURCES WAVE/WAVE100 ) +add_executable(CSE2 ${SOURCES} ${RESOURCE_HEADERS}) + # Handle options if (JAPANESE) list(APPEND RESOURCES "BITMAP/PIXEL_JP.bmp") - add_definitions(-DJAPANESE) + target_compile_definitions(CSE2 PRIVATE JAPANESE) else() list(APPEND RESOURCES "BITMAP/PIXEL.bmp") endif() if (FIX_BUGS) - add_definitions(-DFIX_BUGS) + target_compile_definitions(CSE2 PRIVATE FIX_BUGS) endif() if (WINDOWS) list(APPEND SOURCES "res/ICON/ICON.rc") - add_definitions(-DWINDOWS) + target_compile_definitions(CSE2 PRIVATE WINDOWS) else() list(APPEND RESOURCES "ICON/ICON_MINI.bmp") endif() if (RASPBERRY_PI) - add_definitions(-DRASPBERRY_PI) + target_compile_definitions(CSE2 PRIVATE RASPBERRY_PI) endif() if (NONPORTABLE) - add_definitions(-DNONPORTABLE) + target_compile_definitions(CSE2 PRIVATE NONPORTABLE) endif() # Magic to convert resources to header files @@ -262,8 +264,6 @@ foreach(FILENAME IN LISTS RESOURCES) list(APPEND RESOURCE_HEADERS "${OUT_DIR}/${FILENAME}.h") endforeach() -add_executable(CSE2 ${SOURCES} ${RESOURCE_HEADERS}) - if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") # Enable link-time optimisation if available include(CheckIPOSupported)