mirror of
https://github.com/nigels-com/glew.git
synced 2024-11-11 08:43:49 +00:00
CMake: Prefer GLVND if available
This commit is contained in:
parent
2b16160853
commit
2b50f4acd2
@ -1,6 +1,5 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
dist: trusty
|
dist: trusty
|
||||||
sudo: false
|
|
||||||
install:
|
install:
|
||||||
script:
|
script:
|
||||||
- make -C auto clobber
|
- make -C auto clobber
|
||||||
@ -12,8 +11,8 @@ script:
|
|||||||
- make clean && SYSTEM=linux-clang make
|
- make clean && SYSTEM=linux-clang make
|
||||||
- make clean && SYSTEM=linux-clang-egl make
|
- make clean && SYSTEM=linux-clang-egl make
|
||||||
- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' . && make && popd
|
- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' . && make && popd
|
||||||
- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . && make && popd
|
- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_OSMESA=ON . && make && popd
|
||||||
#- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_EGL=1 . && make && popd
|
- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_EGL=ON -DGLEW_X11=OFF . && make && popd
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
|
@ -16,6 +16,10 @@ if(POLICY CMP0042)
|
|||||||
cmake_policy (SET CMP0042 NEW)
|
cmake_policy (SET CMP0042 NEW)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (POLICY CMP0072)
|
||||||
|
cmake_policy (SET CMP0072 NEW)
|
||||||
|
endif(POLICY CMP0072)
|
||||||
|
|
||||||
set(CMAKE_DEBUG_POSTFIX d)
|
set(CMAKE_DEBUG_POSTFIX d)
|
||||||
|
|
||||||
option (BUILD_UTILS "utilities" ON)
|
option (BUILD_UTILS "utilities" ON)
|
||||||
@ -45,7 +49,20 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
|||||||
|
|
||||||
find_package (OpenGL REQUIRED)
|
find_package (OpenGL REQUIRED)
|
||||||
|
|
||||||
set (GLEW_LIBRARIES ${OPENGL_LIBRARIES})
|
# cmake<3.10 doesnt detect EGL/GLX
|
||||||
|
if (CMAKE_VERSION VERSION_LESS 3.10)
|
||||||
|
find_library(OPENGL_egl_LIBRARY NAMES EGL)
|
||||||
|
if (OPENGL_egl_LIBRARY)
|
||||||
|
set (OpenGL_EGL_FOUND TRUE)
|
||||||
|
endif ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
# prefer GLVND
|
||||||
|
if (OPENGL_opengl_LIBRARY)
|
||||||
|
set (GLEW_LIBRARIES ${OPENGL_opengl_LIBRARY})
|
||||||
|
else ()
|
||||||
|
set (GLEW_LIBRARIES ${OPENGL_gl_LIBRARY})
|
||||||
|
endif ()
|
||||||
|
|
||||||
# X11 required except for Windows and Apple OSX platforms
|
# X11 required except for Windows and Apple OSX platforms
|
||||||
if (GLEW_X11 AND NOT WIN32 AND NOT APPLE)
|
if (GLEW_X11 AND NOT WIN32 AND NOT APPLE)
|
||||||
@ -83,7 +100,7 @@ if (GLEW_OSMESA)
|
|||||||
set (OSMESA_LIB_NAME OSMesa)
|
set (OSMESA_LIB_NAME OSMesa)
|
||||||
endif ()
|
endif ()
|
||||||
add_definitions (-DGLEW_OSMESA)
|
add_definitions (-DGLEW_OSMESA)
|
||||||
set (GLEW_LIBRARIES ${OSMESA_LIB_NAME} ${OPENGL_LIBRARIES})
|
list (APPEND GLEW_LIBRARIES ${OSMESA_LIB_NAME})
|
||||||
set (X11_LIBRARIES)
|
set (X11_LIBRARIES)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
@ -94,7 +111,7 @@ if (GLEW_EGL AND UNIX)
|
|||||||
if (NOT OpenGL_EGL_FOUND)
|
if (NOT OpenGL_EGL_FOUND)
|
||||||
message (FATAL_ERROR "EGL library set but not found.")
|
message (FATAL_ERROR "EGL library set but not found.")
|
||||||
endif ()
|
endif ()
|
||||||
set (GLEW_LIBRARIES ${OPENGL_LIBRARIES} ${OPENGL_egl_LIBRARY})
|
list (APPEND GLEW_LIBRARIES ${OPENGL_egl_LIBRARY})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
#### GLEW ####
|
#### GLEW ####
|
||||||
|
Loading…
Reference in New Issue
Block a user