Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatted variables not used outside of the local CMake project.

Browse Source
This commit is contained in:
Camilla Berglund 2012-03-25 16:34:36 +02:00
parent 441452467a
commit 20e685d37b
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -32,11 +32,11 @@ if (WIN32)
set(_GLFW_WIN32_WGL 1) set(_GLFW_WIN32_WGL 1)
# Set up library and include paths # Set up library and include paths
list(APPEND GLFW_INCLUDE_DIR ${OPENGL_INCLUDE_DIR}) list(APPEND glfw_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR})
list(APPEND GLFW_LIBRARIES ${OPENGL_gl_LIBRARY}) list(APPEND glfw_LIBRARIES ${OPENGL_gl_LIBRARY})
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
list(APPEND GLFW_LIBRARIES winmm) list(APPEND glfw_LIBRARIES winmm)
endif() endif()
endif() endif()
@ -52,8 +52,8 @@ if (UNIX AND NOT APPLE)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
# Set up library and include paths # Set up library and include paths
list(APPEND GLFW_INCLUDE_DIR ${X11_X11_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR}) list(APPEND glfw_INCLUDE_DIRS ${X11_X11_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR})
list(APPEND GLFW_LIBRARIES ${X11_X11_LIB} ${OPENGL_gl_LIBRARY}) list(APPEND glfw_LIBRARIES ${X11_X11_LIB} ${OPENGL_gl_LIBRARY})
set(GLFW_PKGLIBS "gl x11") set(GLFW_PKGLIBS "gl x11")
@ -61,27 +61,27 @@ if (UNIX AND NOT APPLE)
include(CheckSymbolExists) include(CheckSymbolExists)
# This is needed by the GLX function checks below # This is needed by the GLX function checks below
set(CMAKE_REQUIRED_LIBRARIES ${GLFW_LIBRARIES}) set(CMAKE_REQUIRED_LIBRARIES ${glfw_LIBRARIES})
# Check for XRandR (modern resolution switching extension) # Check for XRandR (modern resolution switching extension)
if (X11_Xrandr_FOUND) if (X11_Xrandr_FOUND)
set(_GLFW_HAS_XRANDR 1) set(_GLFW_HAS_XRANDR 1)
list(APPEND GLFW_INCLUDE_DIR ${X11_Xrandr_INCLUDE_PATH}) list(APPEND glfw_INCLUDE_DIRS ${X11_Xrandr_INCLUDE_PATH})
list(APPEND GLFW_LIBRARIES ${X11_Xrandr_LIB}) list(APPEND glfw_LIBRARIES ${X11_Xrandr_LIB})
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} xrandr") set(GLFW_PKGLIBS "${GLFW_PKGLIBS} xrandr")
endif() endif()
# Check for Xf86VidMode (fallback legacy resolution switching extension) # Check for Xf86VidMode (fallback legacy resolution switching extension)
if (X11_xf86vmode_FOUND) if (X11_xf86vmode_FOUND)
set(_GLFW_HAS_XF86VIDMODE 1) set(_GLFW_HAS_XF86VIDMODE 1)
list(APPEND GLFW_INCLUDE_DIR ${X11_xf86vmode_INCLUDE_PATH}) list(APPEND glfw_INCLUDE_DIRS ${X11_xf86vmode_INCLUDE_PATH})
# NOTE: This is a workaround for CMake bug 0006976 (missing # NOTE: This is a workaround for CMake bug 0006976 (missing
# X11_xf86vmode_LIB variable) # X11_xf86vmode_LIB variable)
if (X11_xf86vmode_LIB) if (X11_xf86vmode_LIB)
list(APPEND GLFW_LIBRARIES ${X11_xf86vmode_LIB}) list(APPEND glfw_LIBRARIES ${X11_xf86vmode_LIB})
else() else()
list(APPEND GLFW_LIBRARIES Xxf86vm) list(APPEND glfw_LIBRARIES Xxf86vm)
endif() endif()
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} xxf86vm") set(GLFW_PKGLIBS "${GLFW_PKGLIBS} xxf86vm")
@ -90,20 +90,20 @@ if (UNIX AND NOT APPLE)
# Check for Xkb (X keyboard extension) # Check for Xkb (X keyboard extension)
if (X11_Xkb_FOUND) if (X11_Xkb_FOUND)
set(_GLFW_HAS_XKB 1) set(_GLFW_HAS_XKB 1)
list(APPEND GLFW_INCLUDE_DIR ${X11_Xkb_INCLUDE_PATH}) list(APPEND glfw_INCLUDE_DIR ${X11_Xkb_INCLUDE_PATH})
endif() endif()
find_library(RT_LIBRARY rt) find_library(RT_LIBRARY rt)
mark_as_advanced(RT_LIBRARY) mark_as_advanced(RT_LIBRARY)
if (RT_LIBRARY) if (RT_LIBRARY)
list(APPEND GLFW_LIBRARIES ${RT_LIBRARY}) list(APPEND glfw_LIBRARIES ${RT_LIBRARY})
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} rt") set(GLFW_PKGLIBS "${GLFW_PKGLIBS} rt")
endif() endif()
find_library(MATH_LIBRARY m) find_library(MATH_LIBRARY m)
mark_as_advanced(MATH_LIBRARY) mark_as_advanced(MATH_LIBRARY)
if (MATH_LIBRARY) if (MATH_LIBRARY)
list(APPEND GLFW_LIBRARIES ${MATH_LIBRARY}) list(APPEND glfw_LIBRARIES ${MATH_LIBRARY})
set(GLFW_PKGLIBS "${GLFW_PKGLIBS} m") set(GLFW_PKGLIBS "${GLFW_PKGLIBS} m")
endif() endif()
@ -153,7 +153,7 @@ if (UNIX AND APPLE)
find_library(COCOA_FRAMEWORK Cocoa) find_library(COCOA_FRAMEWORK Cocoa)
find_library(IOKIT_FRAMEWORK IOKit) find_library(IOKIT_FRAMEWORK IOKit)
find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation) find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation)
list(APPEND GLFW_LIBRARIES ${COCOA_FRAMEWORK} list(APPEND glfw_LIBRARIES ${COCOA_FRAMEWORK}
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${IOKIT_FRAMEWORK} ${IOKIT_FRAMEWORK}
${CORE_FOUNDATION_FRAMEWORK}) ${CORE_FOUNDATION_FRAMEWORK})

39
src/CMakeLists.txt
View File

@ -8,33 +8,33 @@ endif()
include_directories(${GLFW_SOURCE_DIR}/src include_directories(${GLFW_SOURCE_DIR}/src
${GLFW_BINARY_DIR}/src ${GLFW_BINARY_DIR}/src
${GLFW_INCLUDE_DIR}) ${glfw_INCLUDE_DIRS})
set(common_SOURCES error.c fullscreen.c gamma.c init.c input.c set(common_SOURCES error.c fullscreen.c gamma.c init.c input.c
joystick.c opengl.c time.c window.c) joystick.c opengl.c time.c window.c)
if (_GLFW_COCOA_NSGL) if (_GLFW_COCOA_NSGL)
set(libglfw_SOURCES ${common_SOURCES} cocoa_fullscreen.m cocoa_gamma.c set(glfw_SOURCES ${common_SOURCES} cocoa_fullscreen.m cocoa_gamma.c
cocoa_init.m cocoa_input.m cocoa_joystick.m cocoa_init.m cocoa_input.m cocoa_joystick.m
cocoa_opengl.m cocoa_time.c cocoa_window.m) cocoa_opengl.m cocoa_time.c 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(${libglfw_SOURCES} PROPERTIES LANGUAGE C) set_source_files_properties(${glfw_SOURCES} PROPERTIES LANGUAGE C)
elseif (_GLFW_WIN32_WGL) elseif (_GLFW_WIN32_WGL)
set(libglfw_SOURCES ${common_SOURCES} win32_fullscreen.c win32_gamma.c set(glfw_SOURCES ${common_SOURCES} win32_fullscreen.c win32_gamma.c
win32_init.c win32_input.c win32_joystick.c win32_init.c win32_input.c win32_joystick.c
win32_opengl.c win32_time.c win32_window.c win32_opengl.c win32_time.c win32_window.c
win32_dllmain.c) win32_dllmain.c)
elseif (_GLFW_X11_GLX) elseif (_GLFW_X11_GLX)
set(libglfw_SOURCES ${common_SOURCES} x11_fullscreen.c x11_gamma.c set(glfw_SOURCES ${common_SOURCES} x11_fullscreen.c x11_gamma.c
x11_init.c x11_input.c x11_joystick.c x11_init.c x11_input.c x11_joystick.c
x11_keysym2unicode.c x11_opengl.c x11_time.c x11_keysym2unicode.c x11_opengl.c x11_time.c
x11_window.c) x11_window.c)
else() else()
message(FATAL_ERROR "No supported platform was selected") message(FATAL_ERROR "No supported platform was selected")
endif() endif()
add_library(glfw ${libglfw_SOURCES}) add_library(glfw ${glfw_SOURCES})
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
@ -49,14 +49,15 @@ if (BUILD_SHARED_LIBS)
if (APPLE) if (APPLE)
# 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 glfw COMPILE_FLAGS) get_target_property(glfw_CFLAGS glfw COMPILE_FLAGS)
if (NOT CFLAGS) if (NOT glfw_CFLAGS)
set(CFLAGS "") set(glfw_CFLAGS "")
endif() endif()
set_target_properties(glfw PROPERTIES COMPILE_FLAGS "${CFLAGS} -fno-common") set_target_properties(glfw PROPERTIES
COMPILE_FLAGS "${glfw_CFLAGS} -fno-common")
endif() endif()
target_link_libraries(glfw ${GLFW_LIBRARIES}) target_link_libraries(glfw ${glfw_LIBRARIES})
target_link_libraries(glfw LINK_INTERFACE_LIBRARIES) target_link_libraries(glfw LINK_INTERFACE_LIBRARIES)
endif() endif()