Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: fixes for old cmake 2.8.12

This commit is contained in:
Vladimir Timofeev 2014-11-25 04:11:58 +03:00 committed by Vladimir Timofeev
parent 4e2ab8b961
commit d8980b3a7b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/Modules/FindGLFW3.cmake
View File

@ -39,13 +39,15 @@
find_package(PkgConfig) find_package(PkgConfig)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
# Save some global stuff that we change, to revert after work has been done # Save some global stuff that we change, to revert after work has been done
set(_saved_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH}) set(_saved_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}")
set(_saved_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(_saved_CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES}")
# add /usr/local/lib/pkgconfig to pkg-config search path (some linuxes do not do that, but glfw installs to taht prefix by default) # add /usr/local/lib/pkgconfig to pkg-config search path (some linuxes do not do that, but glfw installs to taht prefix by default)
file(TO_CMAKE_PATH "$ENV{PKG_CONFIG_PATH}" PKG_CONFIG_PATH) file(TO_CMAKE_PATH "$ENV{PKG_CONFIG_PATH}" PKG_CONFIG_PATH)
list(APPEND PKG_CONFIG_PATH "/usr/local/lib/pkgconfig") list(APPEND PKG_CONFIG_PATH "/usr/local/lib/pkgconfig")
file(TO_NATIVE_PATH "${PKG_CONFIG_PATH}" ENV{PKG_CONFIG_PATH}) file(TO_NATIVE_PATH "${PKG_CONFIG_PATH}" new_pkg_config_path)
set(ENV{PKG_CONFIG_PATH} "${new_pkg_config_path}")
message(STATUS "XXX pkg-config search path: $ENV{PKG_CONFIG_PATH}")
# now try to find glfw with pkg-config # now try to find glfw with pkg-config
pkg_check_modules(PC_GLFW3 glfw3) pkg_check_modules(PC_GLFW3 glfw3)
@ -100,8 +102,8 @@ if(PKG_CONFIG_FOUND)
endif() endif()
# Restore global stuff # Restore global stuff
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_saved_CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES "${_saved_CMAKE_FIND_LIBRARY_SUFFIXES}")
set(ENV{PKG_CONFIG_PATH} ${_saved_PKG_CONFIG_PATH}) set(ENV{PKG_CONFIG_PATH} "${_saved_PKG_CONFIG_PATH}")
endif(PKG_CONFIG_FOUND) endif(PKG_CONFIG_FOUND)
# fallback if pkg-config method not work # fallback if pkg-config method not work