From 0e1a004b7deb2464e9a51f35c8712cc6bb1246e3 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Fri, 15 Oct 2010 17:22:30 +0200 Subject: [PATCH] Formatting. --- CMakeLists.txt | 6 ++---- src/cocoa/CMakeLists.txt | 31 ++++++++++++---------------- src/win32/CMakeLists.txt | 44 ++++++++++++++++++++-------------------- src/x11/CMakeLists.txt | 31 +++++++++++++--------------- 4 files changed, 51 insertions(+), 61 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0cf2a4e..c99d1fc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,7 @@ set(GLFW_VERSION_MINOR "0") set(GLFW_VERSION_PATCH "0") set(GLFW_VERSION_EXTRA "") set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}") -set(GLFW_VERSION_FULL - "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}") +set(GLFW_VERSION_FULL "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}") include(CheckFunctionExists) include(CheckSymbolExists) @@ -159,8 +158,7 @@ install(FILES COPYING.txt readme.html # Uninstall operation #-------------------------------------------------------------------- configure_file(${GLFW_SOURCE_DIR}/cmake_uninstall.cmake.in - ${GLFW_BINARY_DIR}/cmake_uninstall.cmake - IMMEDIATE @ONLY) + ${GLFW_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY) add_custom_target(uninstall ${CMAKE_COMMAND} -P diff --git a/src/cocoa/CMakeLists.txt b/src/cocoa/CMakeLists.txt index 37c3b0a8..e2bfa194 100644 --- a/src/cocoa/CMakeLists.txt +++ b/src/cocoa/CMakeLists.txt @@ -1,41 +1,36 @@ -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake - ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake + ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${GLFW_SOURCE_DIR}/src ${GLFW_BINARY_DIR}/src ${GLFW_INCLUDE_DIR}) -set(cocoa_SOURCES - cocoa_enable.m - cocoa_fullscreen.m - cocoa_glext.m - cocoa_init.m - cocoa_joystick.m - cocoa_time.m - cocoa_window.m) +set(cocoa_SOURCES cocoa_enable.m + cocoa_fullscreen.m + cocoa_glext.m + cocoa_init.m + cocoa_joystick.m + cocoa_time.m + cocoa_window.m) # For some reason, CMake doesn't know about .m set_source_files_properties(${cocoa_SOURCES} PROPERTIES LANGUAGE C) -set(libglfw_SOURCES - ${common_SOURCES} - ${cocoa_SOURCES}) +set(libglfw_SOURCES ${common_SOURCES} ${cocoa_SOURCES}) add_library(libglfwStatic STATIC ${libglfw_SOURCES}) add_library(libglfwShared SHARED ${libglfw_SOURCES}) target_link_libraries(libglfwShared ${GLFW_LIBRARIES}) set_target_properties(libglfwStatic libglfwShared PROPERTIES - CLEAN_DIRECT_OUTPUT 1 - OUTPUT_NAME glfw -) + CLEAN_DIRECT_OUTPUT 1 + OUTPUT_NAME glfw) # Append -fno-common to the compile flags to work around a bug in the Apple GCC get_target_property(CFLAGS libglfwShared COMPILE_FLAGS) if(NOT CFLAGS) - set(CFLAGS "") + set(CFLAGS "") endif(NOT CFLAGS) set_target_properties(libglfwShared PROPERTIES COMPILE_FLAGS "${CFLAGS} -fno-common") diff --git a/src/win32/CMakeLists.txt b/src/win32/CMakeLists.txt index f7df1ff7..4886d7ba 100644 --- a/src/win32/CMakeLists.txt +++ b/src/win32/CMakeLists.txt @@ -1,8 +1,8 @@ if(CYGWIN) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake - ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake + ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY) # These lines are intended to remove the --export-all-symbols # flag added in the Modules/Platform/CYGWIN.cmake file of the @@ -19,36 +19,36 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${GLFW_BINARY_DIR}/src ${GLFW_INCLUDE_DIR}) -set(libglfw_SOURCES - ${common_SOURCES} - win32_enable.c - win32_fullscreen.c - win32_gamma.c - win32_glext.c - win32_init.c - win32_joystick.c - win32_time.c - win32_window.c - win32_dllmain.c) +set(libglfw_SOURCES ${common_SOURCES} + win32_enable.c + win32_fullscreen.c + win32_gamma.c + win32_glext.c + win32_init.c + win32_joystick.c + win32_time.c + win32_window.c + win32_dllmain.c) add_library(libglfwStatic STATIC ${libglfw_SOURCES}) add_library(libglfwShared SHARED ${libglfw_SOURCES}) target_link_libraries(libglfwShared ${OPENGL_gl_LIBRARY}) set_target_properties(libglfwShared PROPERTIES - DEFINE_SYMBOL GLFW_BUILD_DLL - PREFIX "" - IMPORT_PREFIX "" - IMPORT_SUFFIX "dll.lib") + DEFINE_SYMBOL GLFW_BUILD_DLL + PREFIX "" + IMPORT_PREFIX "" + IMPORT_SUFFIX "dll.lib") set_target_properties(libglfwStatic libglfwShared PROPERTIES - CLEAN_DIRECT_OUTPUT 1 - OUTPUT_NAME glfw) + CLEAN_DIRECT_OUTPUT 1 + OUTPUT_NAME glfw) if(CYGWIN) # Build for the regular Win32 environment (not Cygwin) - set_target_properties(libglfwStatic libglfwShared PROPERTIES COMPILE_FLAGS "-mwin32 -mno-cygwin") - set_target_properties(libglfwStatic libglfwShared PROPERTIES LINK_FLAGS "-mwin32 -mno-cygwin") + set_target_properties(libglfwStatic libglfwShared PROPERTIES + COMPILE_FLAGS "-mwin32 -mno-cygwin" + LINK_FLAGS "-mwin32 -mno-cygwin") endif(CYGWIN) install(TARGETS libglfwStatic libglfwShared DESTINATION lib) diff --git a/src/x11/CMakeLists.txt b/src/x11/CMakeLists.txt index a75adf7b..4fe09c49 100644 --- a/src/x11/CMakeLists.txt +++ b/src/x11/CMakeLists.txt @@ -1,32 +1,29 @@ -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake - ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake + ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${GLFW_SOURCE_DIR}/src ${GLFW_BINARY_DIR}/src ${GLFW_INCLUDE_DIR}) -set(libglfw_SOURCES - ${common_SOURCES} - x11_enable.c - x11_fullscreen.c - x11_gamma.c - x11_glext.c - x11_init.c - x11_joystick.c - x11_keysym2unicode.c - x11_time.c - x11_window.c) +set(libglfw_SOURCES ${common_SOURCES} + x11_enable.c + x11_fullscreen.c + x11_gamma.c + x11_glext.c + x11_init.c + x11_joystick.c + x11_keysym2unicode.c + x11_time.c + x11_window.c) add_library(libglfwStatic STATIC ${libglfw_SOURCES}) add_library(libglfwShared SHARED ${libglfw_SOURCES}) target_link_libraries(libglfwShared ${GLFW_LIBRARIES}) set_target_properties(libglfwStatic libglfwShared PROPERTIES - CLEAN_DIRECT_OUTPUT 1 - OUTPUT_NAME glfw -) + CLEAN_DIRECT_OUTPUT 1 + OUTPUT_NAME glfw) install(TARGETS libglfwStatic libglfwShared DESTINATION lib) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig)