diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-10 14:04:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-04-10 14:04:51 (GMT) |
| commit | e265ddecfc8df5509acd16958da134291a96df9f (patch) | |
| tree | 14b185e88dbb75dcdfc6bd75eeed06df5152fb2a | |
| parent | 63a57d1bd994338ec1b1c4e04f82b511d66ec761 (diff) | |
| parent | 94420a7b61d6c83dbd2ba0ce566af6624cd07aad (diff) | |
| download | CMake-e265ddecfc8df5509acd16958da134291a96df9f.zip CMake-e265ddecfc8df5509acd16958da134291a96df9f.tar.gz CMake-e265ddecfc8df5509acd16958da134291a96df9f.tar.bz2 | |
Merge branch 'packaging-qtsdk' into release
| -rw-r--r-- | Packaging/QtSDK/ToolsCMakeXX.cmake | 2 | ||||
| -rw-r--r-- | Packaging/QtSDK/qt.tools.cmake.xx.qs.in | 30 |
2 files changed, 15 insertions, 17 deletions
diff --git a/Packaging/QtSDK/ToolsCMakeXX.cmake b/Packaging/QtSDK/ToolsCMakeXX.cmake index c5f8f34..99731fb 100644 --- a/Packaging/QtSDK/ToolsCMakeXX.cmake +++ b/Packaging/QtSDK/ToolsCMakeXX.cmake @@ -13,7 +13,7 @@ set(CMake_IFW_ROOT_COMPONENT_NAME "qt.tools.cmake.${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}" CACHE STRING "QtSDK CMake tools component name") set(CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME - "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}" + "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}" CACHE STRING "QtSDK CMake tools component display name") set(CMake_IFW_ROOT_COMPONENT_DESCRIPTION "CMake Build Tools ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATH}" diff --git a/Packaging/QtSDK/qt.tools.cmake.xx.qs.in b/Packaging/QtSDK/qt.tools.cmake.xx.qs.in index 81ce157..e806dd7 100644 --- a/Packaging/QtSDK/qt.tools.cmake.xx.qs.in +++ b/Packaging/QtSDK/qt.tools.cmake.xx.qs.in @@ -25,24 +25,22 @@ Component.prototype.createOperations = function() { component.createOperations(); - if (installer.value("os") == "win") { - try { - if (installer.value("SDKToolBinary") == "") - return; + try { + if (installer.value("SDKToolBinary") == "") + return; - var cmId = component.name; - installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_ID", cmId); + var cmId = component.name; + installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_ID", cmId); - component.addOperation("Execute", - ["{0,2}", "@SDKToolBinary@", "addCMake", - "--id", cmId, - "--name", "%CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME%", - "--path", "@CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR@/cmake.exe", - "UNDOEXECUTE", - "@SDKToolBinary@", "rmCMake", "--id", cmId]); + component.addOperation("Execute", + ["{0,2}", "@SDKToolBinary@", "addCMake", + "--id", cmId, + "--name", "%CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME%", + "--path", "@CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR@/cmake%CMAKE_EXECUTABLE_SUFFIX%", + "UNDOEXECUTE", + "@SDKToolBinary@", "rmCMake", "--id", cmId]); - } catch( e ) { - print( e ); - } + } catch( e ) { + print( e ); } } |