Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modernize src and examples CMake build files

Browse Source
This commit is contained in:
Zbigniew Mandziejewicz 2015-10-05 05:38:37 +08:00
parent ba2c5a7d06
commit 97fd691183
3 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/CMakeLists.txt
View File

@ -1,15 +1,5 @@
link_libraries(glfw) link_libraries(glfw)
include_directories(${GLFW_SOURCE_DIR}/deps)
if (BUILD_SHARED_LIBS)
add_definitions(-DGLFW_DLL)
link_libraries("${OPENGL_gl_LIBRARY}" "${MATH_LIBRARY}")
else()
link_libraries(${glfw_LIBRARIES})
endif()
include_directories("${GLFW_SOURCE_DIR}/include"
"${GLFW_SOURCE_DIR}/deps")
if ("${OPENGL_INCLUDE_DIR}") if ("${OPENGL_INCLUDE_DIR}")
include_directories("${OPENGL_INCLUDE_DIR}") include_directories("${OPENGL_INCLUDE_DIR}")
@ -56,4 +46,3 @@ if (APPLE)
MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION_FULL} MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION_FULL}
MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/MacOSXBundleInfo.plist.in") MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/MacOSXBundleInfo.plist.in")
endif() endif()

20
src/CMakeLists.txt
View File

@ -1,10 +1,3 @@
include_directories("${GLFW_SOURCE_DIR}/src"
"${GLFW_BINARY_DIR}/src"
${glfw_INCLUDE_DIRS})
add_definitions(-D_GLFW_USE_CONFIG_H)
set(common_HEADERS internal.h set(common_HEADERS internal.h
"${GLFW_BINARY_DIR}/src/glfw_config.h" "${GLFW_BINARY_DIR}/src/glfw_config.h"
"${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h" "${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h"
@ -59,9 +52,15 @@ endif()
add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS}) add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
target_link_libraries(glfw ${glfw_LIBRARIES}) target_link_libraries(glfw ${glfw_LIBRARIES})
target_include_directories(glfw PUBLIC target_include_directories(glfw
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
PRIVATE
"${GLFW_SOURCE_DIR}/src"
"${GLFW_BINARY_DIR}/src"
${glfw_INCLUDE_DIRS})
target_compile_definitions(glfw PRIVATE -D_GLFW_USE_CONFIG_H)
set_target_properties(glfw PROPERTIES set_target_properties(glfw PROPERTIES
OUTPUT_NAME "${GLFW_LIB_NAME}" OUTPUT_NAME "${GLFW_LIB_NAME}"
@ -97,4 +96,3 @@ endif()
if (GLFW_INSTALL) if (GLFW_INSTALL)
install(TARGETS glfw EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX}) install(TARGETS glfw EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX})
endif() endif()

12
tests/CMakeLists.txt
View File

@ -1,15 +1,5 @@
link_libraries(glfw) link_libraries(glfw)
include_directories(${GLFW_SOURCE_DIR}/deps)
if (BUILD_SHARED_LIBS)
add_definitions(-DGLFW_DLL)
link_libraries("${OPENGL_gl_LIBRARY}" "${MATH_LIBRARY}")
else()
link_libraries(${glfw_LIBRARIES})
endif()
include_directories("${GLFW_SOURCE_DIR}/include"
"${GLFW_SOURCE_DIR}/deps")
if ("${OPENGL_INCLUDE_DIR}") if ("${OPENGL_INCLUDE_DIR}")
include_directories("${OPENGL_INCLUDE_DIR}") include_directories("${OPENGL_INCLUDE_DIR}")