From d28add2747353403677e27b339d2f61838052b5e Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 5 Dec 2023 16:24:35 +0100 Subject: [PATCH] move commandline custom build down in the file --- CMakeLists.txt | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 211b998..00f2236 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,29 +110,6 @@ find_package(RapidJSON CONFIG REQUIRED) find_package(sol2 CONFIG REQUIRED) find_package(toml11 CONFIG REQUIRED) -# build commandline manually for funky windows flags to carry over without a custom toolchain file -add_library(commandline_static - deps/commandline/src/impls.h - deps/commandline/src/windows_impl.cpp - deps/commandline/src/linux_impl.cpp - deps/commandline/src/backends/InteractiveBackend.cpp - deps/commandline/src/backends/InteractiveBackend.h - deps/commandline/src/backends/Backend.cpp - deps/commandline/src/backends/Backend.h - deps/commandline/src/commandline.h - deps/commandline/src/commandline.cpp - deps/commandline/src/backends/BufferedBackend.cpp - deps/commandline/src/backends/BufferedBackend.h -) -if (WIN32) - target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1) -else () - target_compile_definitions(commandline_static PRIVATE -DPLATFORM_LINUX=1) -endif () -target_include_directories(commandline_static PUBLIC "deps/commandline/src") -target_link_libraries(commandline_static Threads::Threads) -# end of commandline custom build - include_directories(include) # to enable multithreading and the Threads::Threads dependency @@ -176,6 +153,29 @@ set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS} PRJ_VERSION_PATCH=${PROJECT_VERSION_PATCH} ) +# build commandline manually for funky windows flags to carry over without a custom toolchain file +add_library(commandline_static + deps/commandline/src/impls.h + deps/commandline/src/windows_impl.cpp + deps/commandline/src/linux_impl.cpp + deps/commandline/src/backends/InteractiveBackend.cpp + deps/commandline/src/backends/InteractiveBackend.h + deps/commandline/src/backends/Backend.cpp + deps/commandline/src/backends/Backend.h + deps/commandline/src/commandline.h + deps/commandline/src/commandline.cpp + deps/commandline/src/backends/BufferedBackend.cpp + deps/commandline/src/backends/BufferedBackend.h +) +if (WIN32) + target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1) +else () + target_compile_definitions(commandline_static PRIVATE -DPLATFORM_LINUX=1) +endif () +target_include_directories(commandline_static PUBLIC "deps/commandline/src") +target_link_libraries(commandline_static Threads::Threads) +# end of commandline custom build + add_executable(${PROJECT_NAME} ${PRJ_HEADERS} ${PRJ_SOURCES} ${PRJ_MAIN}) set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}