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
32c15658
Commit
32c15658
authored
7 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix CMakeLists.txt regarding PythonQt.
parent
7fea9bdc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+13
-2
13 additions, 2 deletions
CMakeLists.txt
with
13 additions
and
2 deletions
CMakeLists.txt
+
13
−
2
View file @
32c15658
...
...
@@ -80,8 +80,19 @@ IF(NOT CLIENT_ONLY)
SET
(
PKG_CONFIG_EXTRA
"qtversion=
${
Qt5Core_VERSION
}
"
)
ENDIF
(
USE_QT4
)
FIND_PACKAGE
(
PythonQt COMPONENTS QtAll
)
SET
(
GEPETTO_GUI_HAS_PYTHONQT
(
${
PythonQt_FOUND
}
AND
${
PythonQt_QtAll_FOUND
}
)
CACHE BOOL
"Use PythonQt dependency"
)
# If GEPETTO_GUI_HAS_PYTHONQT is set to TRUE, then PythonQt is required.
IF
(
DEFINED GEPETTO_GUI_HAS_PYTHONQT AND GEPETTO_GUI_HAS_PYTHONQT
)
FIND_PACKAGE
(
PythonQt REQUIRED COMPONENTS QtAll
)
ELSE
()
FIND_PACKAGE
(
PythonQt COMPONENTS QtAll
)
ENDIF
()
# Declare option GEPETTO_GUI_HAS_PYTHONQT
# If GEPETTO_GUI_HAS_PYTHONQT was defined, this does not change its value.
IF
(
PythonQt_FOUND AND PythonQt_QtAll_FOUND
)
SET
(
GEPETTO_GUI_HAS_PYTHONQT TRUE CACHE BOOL
"Use PythonQt dependency"
)
ELSE
()
SET
(
GEPETTO_GUI_HAS_PYTHONQT FALSE CACHE BOOL
"Use PythonQt dependency"
)
ENDIF
()
PKG_CONFIG_APPEND_LIBS
(
${
PROJECT_NAME
}
)
...
...
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