From 9e1031a35adb5c90b8e73229048a4bc9b07d9d69 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 4 Oct 2010 21:14:58 +0200 Subject: [PATCH] Moved listmodes test program to tests directory. --- examples/CMakeLists.txt | 10 ++-------- tests/CMakeLists.txt | 4 +++- {examples => tests}/listmodes.c | 0 3 files changed, 5 insertions(+), 9 deletions(-) rename {examples => tests}/listmodes.c (100%) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 1390ab13..3f5a7c4f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -5,8 +5,6 @@ link_libraries(libglfwStatic ${GLFW_LIBRARIES} ${OPENGL_glu_LIBRARY}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${OPENGL_INCLUDE_DIR}) -add_executable(listmodes listmodes.c) - if(APPLE) # Set fancy names for bundles add_executable(Boing MACOSX_BUNDLE boing.c) @@ -25,21 +23,17 @@ else(APPLE) endif(APPLE) set(WINDOWS_BINARIES boing gears heightmap splitview triangle wave) -set(CONSOLE_BINARIES listmodes) if(MSVC) # Tell MSVC to use main instead of WinMain for Windows subsystem executables - set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} + set_target_properties(${WINDOWS_BINARIES} PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup") endif(MSVC) if(CYGWIN) # Set cross-compile and subsystem compile and link flags - set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} - PROPERTIES COMPILE_FLAGS "-mno-cygwin") set_target_properties(${WINDOWS_BINARIES} + PROPERTIES COMPILE_FLAGS "-mno-cygwin" 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 822f603f..085b6b67 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,6 +8,7 @@ add_executable(events events.c) add_executable(fsfocus fsfocus.c) add_executable(iconify iconify.c getopt.c) add_executable(joysticks joysticks.c) +add_executable(listmodes listmodes.c) add_executable(peter peter.c) add_executable(reopen reopen.c) add_executable(version version.c getopt.c) @@ -29,7 +30,8 @@ else() endif(APPLE) set(WINDOWS_BINARIES accuracy sharing tearing windows) -set(CONSOLE_BINARIES defaults events fsaa fsfocus iconify joysticks peter reopen version) +set(CONSOLE_BINARIES defaults events fsaa fsfocus iconify joysticks listmodes + peter reopen version) if(MSVC) # Tell MSVC to use main instead of WinMain for Windows subsystem executables diff --git a/examples/listmodes.c b/tests/listmodes.c similarity index 100% rename from examples/listmodes.c rename to tests/listmodes.c