From ea61ad59ec4ae91ad7407fc04abf5f8f9dc7cbb3 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 30 Sep 2021 12:08:01 +0200 Subject: [PATCH] possibility to only use legacy opengl --- src/CMakeLists.txt | 1 - src/cmake/meshlab_global_settings.cmake | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5b13e98e4..8b77493a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,7 +10,6 @@ option(BUILD_MINI "Build only a minimal set of plugins" OFF) option(BUILD_STRICT "Strictly enforce resolution of all symbols" ON) option(BUILD_WITH_DOUBLE_SCALAR "Use double type instead of float type for scalars" OFF) option(ENABLE_MESHLAB_DEBUG_LOG_FILE "If enabled, all the logs of MeshLab will be also saved into a log file" OFF) -option(USE_OPENGL_GLVND "Prefer GLVND OpenGL on linux instead of the default legacy" OFF) option(BUILD_ONLY_MESHLAB_LIBRARIES "Build only meshlab-common and plugins" OFF) option(USE_DEFAULT_BUILD_AND_INSTALL_DIRS "If set to OFF, it expects that you set manually the binary and install directories" ON) diff --git a/src/cmake/meshlab_global_settings.cmake b/src/cmake/meshlab_global_settings.cmake index 00d75d9dd..beda59feb 100644 --- a/src/cmake/meshlab_global_settings.cmake +++ b/src/cmake/meshlab_global_settings.cmake @@ -2,13 +2,7 @@ # Copyright 2019, 2020, Visual Computing Lab, ISTI - Italian National Research Council # SPDX-License-Identifier: BSL-1.0 -if(POLICY CMP0072) - if (USE_OPENGL_GLVND) - cmake_policy(SET CMP0072 NEW) # OpenGL GLVND - else() - cmake_policy(SET CMP0072 OLD) # OpenGL legacy - endif() -endif() +set(OpenGL_GL_PREFERENCE LEGACY) # OpenGL legacy # Enable setting options with SET cmake command set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)