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

fixed CMake lib / includes path finding during configuration

Browse Source
This commit is contained in:
zwookie
2015-04-04 02:55:33 -07:00
parent ea910a55ca
commit 27f3a2b9bc
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindGLFW3.cmake
View File

@@ -18,11 +18,11 @@ set( _glfw3_HEADER_SEARCH_DIRS
"/usr/include" "/usr/include"
"/usr/local/include" "/usr/local/include"
"${CMAKE_SOURCE_DIR}/includes" "${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"
"/usr/local/lib" "/usr/local/lib"
"${CMAKE_SOURCE_DIR}/lib"
"C:/Program Files (x86)/glfw/lib-msvc110" ) "C:/Program Files (x86)/glfw/lib-msvc110" )
# Check environment for root search directory # Check environment for root search directory

47
cmake/modules/FindSOIL.cmake
View File

@@ -9,27 +9,34 @@
# #
# author: Kazunori Kimura # author: Kazunori Kimura
# email : kazunori.abu@gmail.com # email : kazunori.abu@gmail.com
find_path(SOIL_INCLUDE_DIR_TMP SOIL.h #
HINTS ${SOIL_ROOT_DIR} # revisions: github.com/zwookie
PATH_SUFFIXES include/SOIL SOIL include
find_path(SOIL_INCLUDE_DIR SOIL.h
/usr/include
/usr/local/include
/opt/local/include
${CMAKE_SOURCE_DIR}/includes ${CMAKE_SOURCE_DIR}/includes
)
find_library(SOIL_LIBRARY SOIL
/usr/lib64
/usr/lib
/usr/local/lib
/opt/local/lib
${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/lib
) )
if(${SOIL_INCLUDE_DIR_TMP} STREQUAL "SOIL_INCLUDE_DIR_TMP-NOTFOUND")
set(SOIL_INCLUDE_DIR ${SOIL_INCLUDE_DIR_TMP})
else()
string(REGEX REPLACE "(.*)/SOIL" "\\1" SOIL_INCLUDE_DIR ${SOIL_INCLUDE_DIR_TMP})
endif()
find_library(SOIL_LIBRARY IF(SOIL_INCLUDE_DIR AND SOIL_LIBRARY)
NAMES SOIL SET( SOIL_FOUND TRUE )
HINTS ${SOIL_ROOT_DIR} SET( SOIL_LIBRARIES ${SOIL_LIBRARY} )
PATH_SUFFIXES lib ENDIF(SOIL_INCLUDE_DIR AND SOIL_LIBRARY)
) IF(SOIL_FOUND)
IF(NOT SOIL_FIND_QUIETLY)
unset(INCLUDE_SEARCH_PATH) MESSAGE(STATUS "Found SOIL: ${SOIL_LIBRARY}")
unset(LIB_SEARCH_PATH) ENDIF(NOT SOIL_FIND_QUIETLY)
unset(SOIL_INCLUDE_DIR_TMP) ELSE(SOIL_FOUND)
include(FindPackageHandleStandardArgs) IF(SOIL_FIND_REQUIRED)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SOIL MESSAGE(FATAL_ERROR "Could not find libSOIL")
REQUIRED_VARS SOIL_LIBRARY SOIL_INCLUDE_DIR) ENDIF(SOIL_FIND_REQUIRED)
ENDIF(SOIL_FOUND)