Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-29 05:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake path quoting fixes.

Browse Source
This commit is contained in:
Camilla Berglund 2014-08-15 01:10:07 +02:00
parent 4ce884fa52
commit 452e95d02a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/CMakeLists.txt
View File

@ -11,8 +11,7 @@ endif()
include_directories("${GLFW_SOURCE_DIR}/include" include_directories("${GLFW_SOURCE_DIR}/include"
"${GLFW_SOURCE_DIR}/deps") "${GLFW_SOURCE_DIR}/deps")
if (NOT APPLE) if ("${OPENGL_INCLUDE_DIR}")
# HACK: This is NOTFOUND on OS X 10.8
include_directories("${OPENGL_INCLUDE_DIR}") include_directories("${OPENGL_INCLUDE_DIR}")
endif() endif()

7
tests/CMakeLists.txt
View File

@ -3,7 +3,7 @@ link_libraries(glfw "${OPENGL_glu_LIBRARY}")
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
add_definitions(-DGLFW_DLL) add_definitions(-DGLFW_DLL)
link_libraries(${OPENGL_gl_LIBRARY} ${MATH_LIBRARY}) link_libraries("${OPENGL_gl_LIBRARY}" "${MATH_LIBRARY}")
else() else()
link_libraries(${glfw_LIBRARIES}) link_libraries(${glfw_LIBRARIES})
endif() endif()
@ -11,9 +11,8 @@ endif()
include_directories("${GLFW_SOURCE_DIR}/include" include_directories("${GLFW_SOURCE_DIR}/include"
"${GLFW_SOURCE_DIR}/deps") "${GLFW_SOURCE_DIR}/deps")
if (NOT APPLE) if ("${OPENGL_INCLUDE_DIR}")
# HACK: This is NOTFOUND on OS X 10.8 include_directories("${OPENGL_INCLUDE_DIR}")
include_directories(${OPENGL_INCLUDE_DIR})
endif() endif()
set(GETOPT "${GLFW_SOURCE_DIR}/deps/getopt.h" set(GETOPT "${GLFW_SOURCE_DIR}/deps/getopt.h"