kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cpackifw-search-algorithm' into release

This commit is contained in:
Brad King 2016-11-03 09:30:29 -04:00
parent 5f7f0ab517 20cc76c93a
commit 8b75290f13
1 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Modules/CPackIFW.cmake
View File

@ -433,11 +433,15 @@
# Default path # Default path
set(_CPACK_IFW_PATHS foreach(_CPACK_IFW_PATH_VAR "QTIFWDIR" "QTDIR")
"${QTIFWDIR}" if(DEFINED ${_CPACK_IFW_PATH_VAR}
"$ENV{QTIFWDIR}" AND NOT "${${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
"${QTDIR}" list(APPEND _CPACK_IFW_PATHS "${${_CPACK_IFW_PATH_VAR}}")
"$ENV{QTIFWDIR}") endif()
if(NOT "$ENV{${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
list(APPEND _CPACK_IFW_PATHS "$ENV{${_CPACK_IFW_PATH_VAR}}")
endif()
endforeach()
if(WIN32) if(WIN32)
list(APPEND _CPACK_IFW_PATHS list(APPEND _CPACK_IFW_PATHS
"$ENV{HOMEDRIVE}/Qt" "$ENV{HOMEDRIVE}/Qt"
@ -447,22 +451,44 @@ else()
"$ENV{HOME}/Qt" "$ENV{HOME}/Qt"
"/opt/Qt") "/opt/Qt")
endif() endif()
list(REMOVE_DUPLICATES _CPACK_IFW_PATHS)
set(_CPACK_IFW_SUFFIXES set(_CPACK_IFW_PREFIXES
# Common # QtSDK
"bin" "Tools/QtInstallerFramework/"
# Second branch # Second branch
"QtIFW2.3.0/bin" "QtIFW"
"QtIFW2.2.0/bin"
"QtIFW2.1.0/bin"
"QtIFW2.0.3/bin"
"QtIFW2.0.1/bin"
"QtIFW2.0.0/bin"
# First branch # First branch
"QtIFW-1.6.0/bin" "QtIFW-")
"QtIFW-1.5.0/bin"
"QtIFW-1.4.0/bin" set(_CPACK_IFW_VERSIONS
"QtIFW-1.3.0/bin") "2.3"
"2.3.0"
"2.2"
"2.2.0"
"2.1"
"2.1.0"
"2.0"
"2.0.3"
"2.0.2"
"2.0.1"
"2.0.0"
"1.6"
"1.6.0"
"1.5"
"1.5.0"
"1.4"
"1.4.0"
"1.3"
"1.3.0")
set(_CPACK_IFW_SUFFIXES "bin")
foreach(_CPACK_IFW_PREFIX ${_CPACK_IFW_PREFIXES})
foreach(_CPACK_IFW_VERSION ${_CPACK_IFW_VERSIONS})
list(APPEND
_CPACK_IFW_SUFFIXES "${_CPACK_IFW_PREFIX}${_CPACK_IFW_VERSION}/bin")
endforeach()
endforeach()
# Look for 'binarycreator' # Look for 'binarycreator'