From e13f0c441c944de45ff3776e73ee771c5cc972e5 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 20 Sep 2010 22:37:22 +0200 Subject: [PATCH] Added binary category variables for easier maintenance. --- examples/CMakeLists.txt | 15 +++++++++++---- tests/CMakeLists.txt | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index a6282a14..2a4e0bd0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -23,15 +23,22 @@ else(APPLE) add_executable(wave WIN32 wave.c) endif(APPLE) +set(WINDOWS_BINARIES boing gears splitview triangle wave) +set(CONSOLE_BINARIES listmodes) + if(MSVC) # Tell MSVC to use main instead of WinMain for Windows subsystem executables - set_target_properties(boing gears splitview triangle wave PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup") + set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} + PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup") endif(MSVC) if(CYGWIN) # Set cross-compile and subsystem compile and link flags - set_target_properties(boing gears listmodes splitview triangle wave PROPERTIES COMPILE_FLAGS "-mno-cygwin") - set_target_properties(boing gears splitview triangle wave PROPERTIES LINK_FLAGS "-mno-cygwin -mwindows") - set_target_properties(listmodes PROPERTIES LINK_FLAGS "-mno-cygwin -mconsole") + set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} + PROPERTIES COMPILE_FLAGS "-mno-cygwin") + set_target_properties(${WINDOWS_BINARIES} + PROPERTIES LINK_FLAGS "-mno-cygwin -mwindows") + set_target_properties(${CONSOLE_BINARIES} + PROPERTIES LINK_FLAGS "-mno-cygwin -mconsole") endif(CYGWIN) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 60abd707..fcd76746 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -26,15 +26,22 @@ else() add_executable(windows WIN32 windows.c) endif(APPLE) +set(WINDOWS_BINARIES accuracy tearing windows) +set(CONSOLE_BINARIES defaults events fsaa fsfocus iconify joysticks peter reopen version) + if(MSVC) # Tell MSVC to use main instead of WinMain for Windows subsystem executables - set_target_properties(accuracy defaults events fsfocus iconify joysticks fsaa peter reopen tearing version windows PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup") + set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} + PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup") endif(MSVC) if(CYGWIN) # Set cross-compile and subsystem compile and link flags - set_target_properties(accuracy defaults events fsaa fsfocus iconify joysticks peter reopen tearing version windows PROPERTIES COMPILE_FLAGS "-mno-cygwin") - set_target_properties(accuracy fsaa tearing windows PROPERTIES LINK_FLAGS "-mno-cygwin -mwindows") - set_target_properties(events defaults fsfocus iconify joysticks peter reopen version PROPERTIES LINK_FLAGS "-mno-cygwin -mconsole") + set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} + PROPERTIES COMPILE_FLAGS "-mno-cygwin") + set_target_properties(${WINDOWS_BINARIES} + PROPERTIES LINK_FLAGS "-mno-cygwin -mwindows") + set_target_properties(${CONSOLE_BINARIES} + PROPERTIES LINK_FLAGS "-mno-cygwin -mconsole") endif(CYGWIN)