From 2c132e2abce0d0066e5addd80d6bef486e88ac5d Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Tue, 23 Apr 2019 23:14:31 +0200 Subject: [PATCH] CMake: disabled googletest for now, use GLVND when searching for OpenGL --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7668d8a..f07749c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,9 +58,12 @@ INCLUDE_DIRECTORIES ( ) FIND_PACKAGE (X11 REQUIRED) -FIND_PACKAGE (OpenGL REQUIRED) FIND_PACKAGE (Threads REQUIRED) +SET (OpenGL_GL_PREFERENCE "GLVND") +FIND_PACKAGE (OpenGL REQUIRED) + + INCLUDE_DIRECTORIES ( 3rdparty/glfw/deps 3rdparty/glfw/include @@ -74,10 +77,8 @@ INCLUDE_DIRECTORIES ( SUBDIRS ( src/modules - tests/ 3rdparty/glfw - 3rdparty/googletest ) SET (GLFW_BUILD_DOCS OFF) @@ -95,8 +96,6 @@ SET ( protot_SRCS 3rdparty/imgui/imgui_demo.cpp 3rdparty/imgui/examples/imgui_impl_glfw.cpp 3rdparty/imgui/examples/imgui_impl_opengl3.cpp - -# 3rdparty/imgui_dock_lumix/imgui_dock.cpp ) SET (PROTOT_SOURCE_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})