Commit f1d12623 authored by schultz's avatar schultz
Browse files

added qwt built with qt 5.10.1 to the search pathes for our visualstudio

machines
parent 4d0eb016
...@@ -25,10 +25,16 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" ) ...@@ -25,10 +25,16 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/")
endif() endif()
if (QT5_FOUND) if (QT5_FOUND)
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" ) if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.10.1" )
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.10.1")
elseif (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" )
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0") SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0")
else() else()
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1") if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
...@@ -52,6 +58,7 @@ find_path(QWT6_INCLUDE_DIR qwt.h ...@@ -52,6 +58,7 @@ find_path(QWT6_INCLUDE_DIR qwt.h
/usr/include /usr/include
/usr/include/qwt /usr/include/qwt
"${VS_SEARCH_PATH}/qwt-6.1.0/include" "${VS_SEARCH_PATH}/qwt-6.1.0/include"
"${VS_SEARCH_PATH}/qwt-6.1.3-qt${Qt5Core_VERSION_STRING}/include"
c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0 c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0
c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2 c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2
c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.1 c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.1
...@@ -79,6 +86,7 @@ if (QWT6_VERSION_FOUND) ...@@ -79,6 +86,7 @@ if (QWT6_VERSION_FOUND)
find_library(QWT6_LIBRARY_RELEASE NAMES qwt find_library(QWT6_LIBRARY_RELEASE NAMES qwt
PATHS PATHS
"${VS_SEARCH_PATH}/qwt-6.1.0/lib" "${VS_SEARCH_PATH}/qwt-6.1.0/lib"
"${VS_SEARCH_PATH}/qwt-6.1.3-qt${Qt5Core_VERSION_STRING}/lib"
"c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2\\lib" "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2\\lib"
"c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0\\lib" "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0\\lib"
"c:\\libs\\Qwt-6.1.0\\lib" "c:\\libs\\Qwt-6.1.0\\lib"
...@@ -88,6 +96,7 @@ if (QWT6_VERSION_FOUND) ...@@ -88,6 +96,7 @@ if (QWT6_VERSION_FOUND)
find_library(QWT6_LIBRARY_DEBUG NAMES qwtd find_library(QWT6_LIBRARY_DEBUG NAMES qwtd
PATHS PATHS
"${VS_SEARCH_PATH}/qwt-6.1.0/lib" "${VS_SEARCH_PATH}/qwt-6.1.0/lib"
"${VS_SEARCH_PATH}/qwt-6.1.3-qt${Qt5Core_VERSION_STRING}/lib"
"c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2\\lib" "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2\\lib"
"c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0\\lib" "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0\\lib"
"c:\\libs\\Qwt-6.1.0\\lib" "c:\\libs\\Qwt-6.1.0\\lib"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment