From 66d00467bb04ddc11105004554a2421b62706926 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Thu, 22 Nov 2018 15:26:15 +0100
Subject: [PATCH] [CMake] look for openscenegraph-osgQt even for Qt5 when osg <
3.5.7
---
CMakeLists.txt | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaef4fd..67263b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,12 +37,6 @@ SET(PROJECT_URL "")
SET(CLIENT_ONLY FALSE CACHE BOOL "Set to true to install the client only")
SET(USE_QT4 TRUE CACHE BOOL "Use Qt4 instead of Qt5")
-IF(USE_QT4)
- SET(OSGQT_LIB_NAME openscenegraph-osgQt)
-ELSE(USE_QT4)
- SET(OSGQT_LIB_NAME openscenegraph-osgQt5)
-ENDIF(USE_QT4)
-
SET(${PROJECT_NAME}_HEADERS
include/gepetto/viewer/corba/windows-manager.hh
include/gepetto/viewer/corba/server.hh
@@ -64,6 +58,13 @@ ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
IF(NOT CLIENT_ONLY)
ADD_REQUIRED_DEPENDENCY("openscenegraph >= 3.2")
+
+ IF(USE_QT4 OR OPENSCENEGRAPH_VERSION VERSION_LESS 3.5.7)
+ SET(OSGQT_LIB_NAME openscenegraph-osgQt)
+ ELSE(USE_QT4 OR OPENSCENEGRAPH_VERSION VERSION_LESS 3.5.7)
+ SET(OSGQT_LIB_NAME openscenegraph-osgQt5)
+ ENDIF(USE_QT4 OR OPENSCENEGRAPH_VERSION VERSION_LESS 3.5.7)
+
ADD_REQUIRED_DEPENDENCY(${OSGQT_LIB_NAME})
ADD_REQUIRED_DEPENDENCY("openthreads >= 2.6")
ADD_REQUIRED_DEPENDENCY("gepetto-viewer")
--
GitLab