From 4880d3604f75075142c1bf7ae31fa959c42b89d4 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 23 Apr 2021 10:12:37 +0300 Subject: [PATCH] revert QGLVIEW flag --- libs/graphic/graphic.cpp | 3 ++- libs/qglview/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/graphic/graphic.cpp b/libs/graphic/graphic.cpp index 7a1135e..6b8581e 100644 --- a/libs/graphic/graphic.cpp +++ b/libs/graphic/graphic.cpp @@ -1628,8 +1628,9 @@ void Graphic::on_graphic_buttonConfigure_clicked() { conf->ui->colorGrid->setColor(grid_pen.color()); conf->ui->comboStyleGrid->setCurrentIndex((int)grid_pen.style()); conf->ui->spinWidthGrid->setValue(grid_pen.widthF()); +#ifdef HAS_GL conf->ui->checkOGL->setChecked(isOGL); -#ifndef HAS_GL +#else conf->ui->checkOGL->setEnabled(false); conf->ui->checkOGL->setChecked(false); #endif diff --git a/libs/qglview/CMakeLists.txt b/libs/qglview/CMakeLists.txt index 7296f0c..d12965a 100644 --- a/libs/qglview/CMakeLists.txt +++ b/libs/qglview/CMakeLists.txt @@ -1,4 +1,4 @@ -if (((DEFINED QGLVIEW) AND QGLVIEW AND HAS_GL) OR (NOT DEFINED QGLVIEW)) +if (((DEFINED QGLVIEW) AND QGLVIEW) OR (NOT DEFINED QGLVIEW)) find_package(OpenGL REQUIRED) shstk_qad_project(qglview FALSE "qad" "Gui;OpenGL;Xml" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}") shstk_qad_install("qad" FALSE qglview "${out_HDR}" "${out_QM}")