mirror of
https://github.com/glfw/glfw.git
synced 2024-11-22 13:04:35 +00:00
Formatting.
This commit is contained in:
parent
7980359f94
commit
0e1a004b7d
@ -8,8 +8,7 @@ set(GLFW_VERSION_MINOR "0")
|
|||||||
set(GLFW_VERSION_PATCH "0")
|
set(GLFW_VERSION_PATCH "0")
|
||||||
set(GLFW_VERSION_EXTRA "")
|
set(GLFW_VERSION_EXTRA "")
|
||||||
set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}")
|
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(CheckFunctionExists)
|
||||||
include(CheckSymbolExists)
|
include(CheckSymbolExists)
|
||||||
@ -159,8 +158,7 @@ install(FILES COPYING.txt readme.html
|
|||||||
# Uninstall operation
|
# Uninstall operation
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
configure_file(${GLFW_SOURCE_DIR}/cmake_uninstall.cmake.in
|
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
|
add_custom_target(uninstall
|
||||||
${CMAKE_COMMAND} -P
|
${CMAKE_COMMAND} -P
|
||||||
|
@ -1,41 +1,36 @@
|
|||||||
|
|
||||||
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)
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
|
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${GLFW_SOURCE_DIR}/src
|
${GLFW_SOURCE_DIR}/src
|
||||||
${GLFW_BINARY_DIR}/src
|
${GLFW_BINARY_DIR}/src
|
||||||
${GLFW_INCLUDE_DIR})
|
${GLFW_INCLUDE_DIR})
|
||||||
|
|
||||||
set(cocoa_SOURCES
|
set(cocoa_SOURCES cocoa_enable.m
|
||||||
cocoa_enable.m
|
cocoa_fullscreen.m
|
||||||
cocoa_fullscreen.m
|
cocoa_glext.m
|
||||||
cocoa_glext.m
|
cocoa_init.m
|
||||||
cocoa_init.m
|
cocoa_joystick.m
|
||||||
cocoa_joystick.m
|
cocoa_time.m
|
||||||
cocoa_time.m
|
cocoa_window.m)
|
||||||
cocoa_window.m)
|
|
||||||
|
|
||||||
# For some reason, CMake doesn't know about .m
|
# For some reason, CMake doesn't know about .m
|
||||||
set_source_files_properties(${cocoa_SOURCES} PROPERTIES LANGUAGE C)
|
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(libglfwStatic STATIC ${libglfw_SOURCES})
|
||||||
add_library(libglfwShared SHARED ${libglfw_SOURCES})
|
add_library(libglfwShared SHARED ${libglfw_SOURCES})
|
||||||
target_link_libraries(libglfwShared ${GLFW_LIBRARIES})
|
target_link_libraries(libglfwShared ${GLFW_LIBRARIES})
|
||||||
set_target_properties(libglfwStatic libglfwShared PROPERTIES
|
set_target_properties(libglfwStatic libglfwShared PROPERTIES
|
||||||
CLEAN_DIRECT_OUTPUT 1
|
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
|
# Append -fno-common to the compile flags to work around a bug in the Apple GCC
|
||||||
get_target_property(CFLAGS libglfwShared COMPILE_FLAGS)
|
get_target_property(CFLAGS libglfwShared COMPILE_FLAGS)
|
||||||
if(NOT CFLAGS)
|
if(NOT CFLAGS)
|
||||||
set(CFLAGS "")
|
set(CFLAGS "")
|
||||||
endif(NOT CFLAGS)
|
endif(NOT CFLAGS)
|
||||||
set_target_properties(libglfwShared PROPERTIES COMPILE_FLAGS "${CFLAGS} -fno-common")
|
set_target_properties(libglfwShared PROPERTIES COMPILE_FLAGS "${CFLAGS} -fno-common")
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
if(CYGWIN)
|
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)
|
${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
|
||||||
|
|
||||||
# These lines are intended to remove the --export-all-symbols
|
# These lines are intended to remove the --export-all-symbols
|
||||||
# flag added in the Modules/Platform/CYGWIN.cmake file of the
|
# 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_BINARY_DIR}/src
|
||||||
${GLFW_INCLUDE_DIR})
|
${GLFW_INCLUDE_DIR})
|
||||||
|
|
||||||
set(libglfw_SOURCES
|
set(libglfw_SOURCES ${common_SOURCES}
|
||||||
${common_SOURCES}
|
win32_enable.c
|
||||||
win32_enable.c
|
win32_fullscreen.c
|
||||||
win32_fullscreen.c
|
win32_gamma.c
|
||||||
win32_gamma.c
|
win32_glext.c
|
||||||
win32_glext.c
|
win32_init.c
|
||||||
win32_init.c
|
win32_joystick.c
|
||||||
win32_joystick.c
|
win32_time.c
|
||||||
win32_time.c
|
win32_window.c
|
||||||
win32_window.c
|
win32_dllmain.c)
|
||||||
win32_dllmain.c)
|
|
||||||
|
|
||||||
add_library(libglfwStatic STATIC ${libglfw_SOURCES})
|
add_library(libglfwStatic STATIC ${libglfw_SOURCES})
|
||||||
add_library(libglfwShared SHARED ${libglfw_SOURCES})
|
add_library(libglfwShared SHARED ${libglfw_SOURCES})
|
||||||
|
|
||||||
target_link_libraries(libglfwShared ${OPENGL_gl_LIBRARY})
|
target_link_libraries(libglfwShared ${OPENGL_gl_LIBRARY})
|
||||||
set_target_properties(libglfwShared PROPERTIES
|
set_target_properties(libglfwShared PROPERTIES
|
||||||
DEFINE_SYMBOL GLFW_BUILD_DLL
|
DEFINE_SYMBOL GLFW_BUILD_DLL
|
||||||
PREFIX ""
|
PREFIX ""
|
||||||
IMPORT_PREFIX ""
|
IMPORT_PREFIX ""
|
||||||
IMPORT_SUFFIX "dll.lib")
|
IMPORT_SUFFIX "dll.lib")
|
||||||
|
|
||||||
set_target_properties(libglfwStatic libglfwShared PROPERTIES
|
set_target_properties(libglfwStatic libglfwShared PROPERTIES
|
||||||
CLEAN_DIRECT_OUTPUT 1
|
CLEAN_DIRECT_OUTPUT 1
|
||||||
OUTPUT_NAME glfw)
|
OUTPUT_NAME glfw)
|
||||||
|
|
||||||
if(CYGWIN)
|
if(CYGWIN)
|
||||||
# Build for the regular Win32 environment (not 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)
|
endif(CYGWIN)
|
||||||
|
|
||||||
install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
|
install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
|
||||||
|
@ -1,32 +1,29 @@
|
|||||||
|
|
||||||
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)
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
|
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${GLFW_SOURCE_DIR}/src
|
${GLFW_SOURCE_DIR}/src
|
||||||
${GLFW_BINARY_DIR}/src
|
${GLFW_BINARY_DIR}/src
|
||||||
${GLFW_INCLUDE_DIR})
|
${GLFW_INCLUDE_DIR})
|
||||||
|
|
||||||
set(libglfw_SOURCES
|
set(libglfw_SOURCES ${common_SOURCES}
|
||||||
${common_SOURCES}
|
x11_enable.c
|
||||||
x11_enable.c
|
x11_fullscreen.c
|
||||||
x11_fullscreen.c
|
x11_gamma.c
|
||||||
x11_gamma.c
|
x11_glext.c
|
||||||
x11_glext.c
|
x11_init.c
|
||||||
x11_init.c
|
x11_joystick.c
|
||||||
x11_joystick.c
|
x11_keysym2unicode.c
|
||||||
x11_keysym2unicode.c
|
x11_time.c
|
||||||
x11_time.c
|
x11_window.c)
|
||||||
x11_window.c)
|
|
||||||
|
|
||||||
add_library(libglfwStatic STATIC ${libglfw_SOURCES})
|
add_library(libglfwStatic STATIC ${libglfw_SOURCES})
|
||||||
add_library(libglfwShared SHARED ${libglfw_SOURCES})
|
add_library(libglfwShared SHARED ${libglfw_SOURCES})
|
||||||
target_link_libraries(libglfwShared ${GLFW_LIBRARIES})
|
target_link_libraries(libglfwShared ${GLFW_LIBRARIES})
|
||||||
set_target_properties(libglfwStatic libglfwShared PROPERTIES
|
set_target_properties(libglfwStatic libglfwShared PROPERTIES
|
||||||
CLEAN_DIRECT_OUTPUT 1
|
CLEAN_DIRECT_OUTPUT 1
|
||||||
OUTPUT_NAME glfw
|
OUTPUT_NAME glfw)
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
|
install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
|
||||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig)
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig)
|
||||||
|
Loading…
Reference in New Issue
Block a user