Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenFlipper-Free
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
24
Issues
24
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
ef7c7ca4
Commit
ef7c7ca4
authored
May 16, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switched to Qt 5.10.1 as department default
parent
5b95ab9b
Pipeline
#6967
canceled with stages
in 13 minutes and 55 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CMakeLists.txt
CMakeLists.txt
+2
-2
OpenFlipper
OpenFlipper
+1
-1
No files found.
CMakeLists.txt
View file @
ef7c7ca4
...
...
@@ -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.
9.0/5.9
/gcc_64/
)
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.
10.1/5.10.1
/gcc_64/
)
# Default to this install path for QT%_INSTALL_DIR
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"
)
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.
10.1/5.10.1
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
endif
()
if
(
WIN32
)
...
...
OpenFlipper
@
f6c8e0fd
Subproject commit
baa3af2da15e6badbfb935eb351f191822620267
Subproject commit
f6c8e0fdce3049611c68672dde6e82978b590b0b
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment