summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-02-02 22:40:30 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-07 17:55:33 +0100
commit8aeb70ed366650dd39c4edf9777bd7a9777cb313 (patch)
tree87ab9717d96fca8d63356bcabd06f5b5f945511f /mkspecs
parent9c31f6793e50b8ded908168e8083aac052ce0947 (diff)
Add special casing for static modules.
QtUITools is a static library, so we need to mark that in its CMakeConfig.cmake file. Change-Id: I4e3684f7c62f4af28956a6e8f58edce7724f50dd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/create_cmake.prf10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 0a14b5cea4..e52e65c06f 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -29,13 +29,15 @@ CMAKE_BIN_DIR = $$replace(CMAKE_BINS, ^.*/, )
CMAKE_RELATIVE_INSTALL_DIR = "../../../"
+static|staticlib:CMAKE_STATIC_TYPE = true
+
macx {
CONFIG(qt_framework, qt_framework|qt_no_framework) {
CMAKE_LIB_FILE_LOCATION_DEBUG = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
CMAKE_BUILD_IS_FRAMEWORK = "true"
} else {
- static {
+ !isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = libQt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.a
CMAKE_LIB_FILE_LOCATION_RELEASE = libQt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.a
} else {
@@ -44,7 +46,7 @@ macx {
}
}
} else:win32 {
- static {
+ !isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_IMPLIB_FILE_LOCATION_DEBUG = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}d.lib
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.lib
} else {
@@ -55,7 +57,7 @@ macx {
}
CMAKE_BIN_SUFFIX = ".exe"
} else {
- static {
+ !isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = libQt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.a
CMAKE_LIB_FILE_LOCATION_RELEASE = libQt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.a
} else {
@@ -72,8 +74,6 @@ debug_and_release|release:release_type = release
INSTALLS += cmake_qt5_module_files
-static:CMAKE_STATIC_TYPE = true
-
cmake_config_file.input = $$PWD/../cmake/Qt5BasicConfig.cmake.in
cmake_config_file.output = $$eval(QT.$${MODULE}.libs)/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Config.cmake