Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
gepetto-viewer-corba
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
gepetto-viewer-corba
Commits
66d00467
Commit
66d00467
authored
6 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] look for openscenegraph-osgQt even for Qt5 when osg < 3.5.7
parent
4a6ad179
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+7
-6
7 additions, 6 deletions
CMakeLists.txt
with
7 additions
and
6 deletions
CMakeLists.txt
+
7
−
6
View file @
66d00467
...
...
@@ -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"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment