Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
9236f6d1
Commit
9236f6d1
authored
May 10, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated acg defaults
parent
6dafbbe2
Pipeline
#1662
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
CMakeLists.txt
CMakeLists.txt
+8
-0
cmake/FindQwt6.cmake
cmake/FindQwt6.cmake
+1
-1
No files found.
CMakeLists.txt
View file @
9236f6d1
cmake_minimum_required
(
VERSION 2.8.9
)
# 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-4.9-x86_64/qt-5.5.1/5.5/gcc_64/
)
# Default to this install path for QT%_INSTALL_DIR
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-4.9-x86_64/qt-5.5.1/5.5/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
endif
()
if
(
WIN32
)
# This is the base directory for windows library search used in the finders we shipp.
set
(
CMAKE_WINDOWS_LIBS_DIR
"c:/libs"
CACHE STRING
"Default Library search dir on windows."
)
...
...
cmake/FindQwt6.cmake
View file @
9236f6d1
...
...
@@ -29,7 +29,7 @@ endif()
if
(
QT5_FOUND
)
if
(
${
Qt5Core_VERSION_STRING
}
VERSION_EQUAL
"5.5.1"
OR
${
Qt5Core_VERSION_STRING
}
VERSION_GREATER
"5.5.1"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5"
)
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5
.5.1
"
)
else
()
SET
(
ACG_SEARCH_PATH
"/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5"
)
endif
()
...
...
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