diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-07 03:55:46 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-07 03:55:46 +0200 |
| commit | 29857b87efdec4ed6a4adb8162d2428460eec53a (patch) | |
| tree | 0738b0504e1c9ce42cc5f5455ee34552576ee6cc | |
| parent | a1ee9c7a2ebc5d450a7428c8f8d7ab6864cb9497 (diff) | |
cmake: cleanup
We now inherit parent process' console. No need for
the cmake cache option.
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 4 | ||||
| -rw-r--r-- | compat/linkage-macros.hpp | 6 | ||||
| -rw-r--r-- | gui/CMakeLists.txt | 12 |
3 files changed, 1 insertions, 21 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index 7052e704..24771e44 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -60,9 +60,6 @@ function(otr_fixup_subsystem n) if(MSVC) set(subsystem WINDOWS) get_property(type TARGET "${n}" PROPERTY TYPE) - if(SDK_CONSOLE_DEBUG AND ".${type}" STREQUAL ".EXECUTABLE") - set(subsystem CONSOLE) - endif() set(loc "$<TARGET_FILE:${n}>") if (NOT type STREQUAL "STATIC_LIBRARY") add_custom_command(TARGET "${n}" @@ -274,7 +271,6 @@ function(otr_prop type) else() set(spc " ") endif() - set_property("${type}" "${f}" APPEND_STRING PROPERTY "${name}" "${spc}${value}") endwhile() endforeach() diff --git a/compat/linkage-macros.hpp b/compat/linkage-macros.hpp index b9bc9801..460e7ee5 100644 --- a/compat/linkage-macros.hpp +++ b/compat/linkage-macros.hpp @@ -7,9 +7,3 @@ # define OTR_GENERIC_EXPORT __attribute__ ((visibility ("default"))) # define OTR_GENERIC_IMPORT #endif - -#if defined _MSC_VER -# define OTR_GENERIC_TEMPLATE -#else -# define OTR_GENERIC_TEMPLATE __attribute__ ((visibility ("default"))) -#endif diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 7d140dd6..d0cba4ac 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,14 +1,4 @@ -if(MSVC OR (NOT SDK_CONSOLE_DEBUG AND WIN32)) - set(console "") -else() - set(console WIN32-CONSOLE) -endif() - -if(WIN32) - SET(SDK_CONSOLE_DEBUG FALSE CACHE BOOL "Console window visible at runtime") -endif() - -otr_module(user-interface EXECUTABLE BIN ${console}) +otr_module(user-interface EXECUTABLE BIN) set_target_properties(opentrack-user-interface PROPERTIES SUFFIX "${opentrack-binary-suffix}" |