lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

modified Find*.cmake files to look in the LearnOpenGL local includes and lib directories

Browse Source
This commit is contained in:
zmertens
2015-04-01 19:48:25 -07:00
parent 80d126cfa2
commit 5c97e68cf4
5 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindASSIMP.cmake
View File

@@ -8,12 +8,14 @@ FIND_PATH( ASSIMP_INCLUDE_DIR assimp/mesh.h
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
${CMAKE_SOURCE_DIR}/includes
) )
FIND_LIBRARY( ASSIMP_LIBRARY assimp FIND_LIBRARY( ASSIMP_LIBRARY assimp
/usr/lib64 /usr/lib64
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
${CMAKE_SOURCE_DIR}/lib
) )
IF(ASSIMP_INCLUDE_DIR AND ASSIMP_LIBRARY) IF(ASSIMP_INCLUDE_DIR AND ASSIMP_LIBRARY)
SET( ASSIMP_FOUND TRUE ) SET( ASSIMP_FOUND TRUE )

2
cmake/modules/FindGLEW.cmake
View File

@@ -8,6 +8,7 @@
# #
IF (WIN32) IF (WIN32)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
${CMAKE_SOURCE_DIR}/includes
$ENV{PROGRAMFILES}/GLEW/include $ENV{PROGRAMFILES}/GLEW/include
${GLEW_ROOT_DIR}/include ${GLEW_ROOT_DIR}/include
DOC "The directory where GL/glew.h resides") DOC "The directory where GL/glew.h resides")
@@ -24,6 +25,7 @@ IF (WIN32)
FIND_LIBRARY( GLEW_LIBRARY FIND_LIBRARY( GLEW_LIBRARY
NAMES glew GLEW glew32 glew32s NAMES glew GLEW glew32 glew32s
PATHS PATHS
${CMAKE_SOURCE_DIR}/lib
$ENV{PROGRAMFILES}/GLEW/lib $ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin ${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib

2
cmake/modules/FindGLFW3.cmake
View File

@@ -17,6 +17,8 @@
set( _glfw3_HEADER_SEARCH_DIRS set( _glfw3_HEADER_SEARCH_DIRS
"/usr/include" "/usr/include"
"/usr/local/include" "/usr/local/include"
"${CMAKE_SOURCE_DIR}/includes"
"${CMAKE_SOURCE_DIR}/lib"
"C:/Program Files (x86)/glfw/include" ) "C:/Program Files (x86)/glfw/include" )
set( _glfw3_LIB_SEARCH_DIRS set( _glfw3_LIB_SEARCH_DIRS
"/usr/lib" "/usr/lib"

1
cmake/modules/FindGLM.cmake
View File

@@ -32,6 +32,7 @@
SET(_glm_HEADER_SEARCH_DIRS SET(_glm_HEADER_SEARCH_DIRS
"/usr/include" "/usr/include"
"/usr/local/include" "/usr/local/include"
"${CMAKE_SOURCE_DIR}/includes"
"C:/Program Files (x86)/glm" ) "C:/Program Files (x86)/glm" )
# check environment variable # check environment variable
SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}") SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}")

2
cmake/modules/FindSOIL.cmake
View File

@@ -12,6 +12,8 @@
find_path(SOIL_INCLUDE_DIR_TMP SOIL.h find_path(SOIL_INCLUDE_DIR_TMP SOIL.h
HINTS ${SOIL_ROOT_DIR} HINTS ${SOIL_ROOT_DIR}
PATH_SUFFIXES include/SOIL SOIL include PATH_SUFFIXES include/SOIL SOIL include
${CMAKE_SOURCE_DIR}/includes
${CMAKE_SOURCE_DIR}/lib
) )
if(${SOIL_INCLUDE_DIR_TMP} STREQUAL "SOIL_INCLUDE_DIR_TMP-NOTFOUND") if(${SOIL_INCLUDE_DIR_TMP} STREQUAL "SOIL_INCLUDE_DIR_TMP-NOTFOUND")
set(SOIL_INCLUDE_DIR ${SOIL_INCLUDE_DIR_TMP}) set(SOIL_INCLUDE_DIR ${SOIL_INCLUDE_DIR_TMP})