lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

moved Apple lib append to Apple if / else statement

Browse Source
This commit is contained in:
zmertens
2015-03-31 19:13:01 -07:00
parent 2098e992b2
commit 38f1272107
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -32,11 +32,10 @@ message(STATUS "Found GLEW in ${GLEW_INCLUDE_DIR}")
if(WIN32) if(WIN32)
set(LIBS glfw3 opengl32 glew32s SOIL assimp) set(LIBS glfw3 opengl32 glew32s SOIL assimp)
elseif (UNIX) elseif (UNIX)
# set(LIBS GL X11 glfw GLEW SOIL assimp rt dl)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
# Linux packages native to CMake # Linux packages native to CMake
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
set(LIBS ${OPENGL_gl_LIBRARY}) set(LIBS ${OPENGL_gl_LIBRARY}) # setting LIBS for the first time
add_definitions(${OPENGL_DEFINITIONS}) add_definitions(${OPENGL_DEFINITIONS})
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
list(APPEND LIBS ${X11_Xrandr_LIB} ${X11_Xxf86vm_LIB} ${X11_Xi_LIB}) list(APPEND LIBS ${X11_Xrandr_LIB} ${X11_Xxf86vm_LIB} ${X11_Xi_LIB})
@@ -59,10 +58,9 @@ IF(APPLE)
MARK_AS_ADVANCED(COCOA_LIBRARY OpenGL_LIBRARY) MARK_AS_ADVANCED(COCOA_LIBRARY OpenGL_LIBRARY)
SET(APPLE_LIBS ${COCOA_LIBRARY} ${IOKit_LIBRARY} ${OpenGL_LIBRARY}) SET(APPLE_LIBS ${COCOA_LIBRARY} ${IOKit_LIBRARY} ${OpenGL_LIBRARY})
SET(APPLE_LIBS ${APPLE_LIBS} /usr/local/lib/libglfw.a) SET(APPLE_LIBS ${APPLE_LIBS} /usr/local/lib/libglfw.a)
set(LIBS ${LIBS} ${APPLE_LIBS})
ENDIF(APPLE) ENDIF(APPLE)
#list(LIBS ${LIBS} ${APPLE_LIBS})
set(CHAPTERS set(CHAPTERS
1.getting_started 1.getting_started
2.lighting 2.lighting
@@ -138,6 +136,8 @@ foreach(CHAPTER ${CHAPTERS})
endforeach(DEMO) endforeach(DEMO)
endforeach(CHAPTER) endforeach(CHAPTER)
#include_directories(${LEARNOPENGL_INCLUDES})
include_directories(${CMAKE_SOURCE_DIR}/includes) include_directories(${CMAKE_SOURCE_DIR}/includes)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})