Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenFlipper
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
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
OpenFlipper-Free
OpenFlipper
Commits
a36d3978
Commit
a36d3978
authored
7 years ago
by
Martin Schultz
Browse files
Options
Downloads
Patches
Plain Diff
set the default path for our lab machines to Qt5.9
parent
c35074f9
No related branches found
No related tags found
1 merge request
!21
Feature find qt easy
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/CMakeLists.txt
+2
-2
2 additions, 2 deletions
cmake/CMakeLists.txt
with
2 additions
and
2 deletions
cmake/CMakeLists.txt
+
2
−
2
View file @
a36d3978
...
...
@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed 5.3 on debian
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.
8
.0/5.
8
/gcc_64/
)
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.
9
.0/5.
9
/gcc_64/
)
# Default to this install path for QT%_INSTALL_DIR
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.
8
.0/5.
8
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.
9
.0/5.
9
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
endif
()
if
(
WIN32
)
...
...
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