Formatting.

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  
+set(GLFW_VERSION_FULL "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}")
-    "${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
+               ${GLFW_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
-               IMMEDIATE @ONLY)
 
 add_custom_target(uninstall
                   ${CMAKE_COMMAND} -P

src/cocoa/CMakeLists.txt

@@ -1,6 +1,5 @@
 
-configure_file(
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
-    ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
                ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
@@ -8,8 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${GLFW_BINARY_DIR}/src
                     ${GLFW_INCLUDE_DIR})
 
-set(cocoa_SOURCES
+set(cocoa_SOURCES cocoa_enable.m
-    cocoa_enable.m
                   cocoa_fullscreen.m
                   cocoa_glext.m
                   cocoa_init.m
@@ -20,17 +18,14 @@ set(cocoa_SOURCES
 # For some reason, CMake doesn't know about .m
 set_source_files_properties(${cocoa_SOURCES} PROPERTIES LANGUAGE C)
 
-set(libglfw_SOURCES
+set(libglfw_SOURCES ${common_SOURCES} ${cocoa_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
+                      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)

src/win32/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 if(CYGWIN)
-    configure_file(
+
-	${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
+    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
@@ -19,8 +19,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${GLFW_BINARY_DIR}/src
                     ${GLFW_INCLUDE_DIR})
 
-set(libglfw_SOURCES
+set(libglfw_SOURCES ${common_SOURCES}
-    ${common_SOURCES}
                     win32_enable.c 
                     win32_fullscreen.c
                     win32_gamma.c
@@ -47,8 +46,9 @@ set_target_properties(libglfwStatic libglfwShared PROPERTIES
 
 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
-    set_target_properties(libglfwStatic libglfwShared PROPERTIES LINK_FLAGS "-mwin32 -mno-cygwin")
+                          COMPILE_FLAGS "-mwin32 -mno-cygwin"
+                          LINK_FLAGS "-mwin32 -mno-cygwin")
 endif(CYGWIN)
 
 install(TARGETS libglfwStatic libglfwShared DESTINATION lib)

src/x11/CMakeLists.txt

@@ -1,6 +1,5 @@
 
-configure_file(
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
-    ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
                ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
@@ -8,8 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${GLFW_BINARY_DIR}/src
                     ${GLFW_INCLUDE_DIR})
 
-set(libglfw_SOURCES
+set(libglfw_SOURCES ${common_SOURCES}
-    ${common_SOURCES}
                     x11_enable.c 
                     x11_fullscreen.c
                     x11_gamma.c
@@ -25,8 +23,7 @@ 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
+                      OUTPUT_NAME glfw)
-)
 
 install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig)