martin
/
protot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: disabled googletest for now, use GLVND when searching for OpenGL

opengl3
Martin Felis 2019-04-23 23:14:31 +02:00
parent c1b3239249
commit 2c132e2abc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -58,9 +58,12 @@ INCLUDE_DIRECTORIES (
) )
FIND_PACKAGE (X11 REQUIRED) FIND_PACKAGE (X11 REQUIRED)
FIND_PACKAGE (OpenGL REQUIRED)
FIND_PACKAGE (Threads REQUIRED) FIND_PACKAGE (Threads REQUIRED)
SET (OpenGL_GL_PREFERENCE "GLVND")
FIND_PACKAGE (OpenGL REQUIRED)
INCLUDE_DIRECTORIES ( INCLUDE_DIRECTORIES (
3rdparty/glfw/deps 3rdparty/glfw/deps
3rdparty/glfw/include 3rdparty/glfw/include
@ -74,10 +77,8 @@ INCLUDE_DIRECTORIES (
SUBDIRS ( SUBDIRS (
src/modules src/modules
tests/
3rdparty/glfw 3rdparty/glfw
3rdparty/googletest
) )
SET (GLFW_BUILD_DOCS OFF) SET (GLFW_BUILD_DOCS OFF)
@ -95,8 +96,6 @@ SET ( protot_SRCS
3rdparty/imgui/imgui_demo.cpp 3rdparty/imgui/imgui_demo.cpp
3rdparty/imgui/examples/imgui_impl_glfw.cpp 3rdparty/imgui/examples/imgui_impl_glfw.cpp
3rdparty/imgui/examples/imgui_impl_opengl3.cpp 3rdparty/imgui/examples/imgui_impl_opengl3.cpp
# 3rdparty/imgui_dock_lumix/imgui_dock.cpp
) )
SET (PROTOT_SOURCE_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}) SET (PROTOT_SOURCE_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})