summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-04-20 19:43:00 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-23 17:03:43 +0200
commitf88212c22f7e4bec261130a6f82294adfc75abca (patch)
tree0bf83a3efc4702a6fb14d91244b21d43d5751069
parentecba58500e752899cbd4cedcd78cf1e7b35b043e (diff)
Don't tell CMake we're making debug libraries if we're not.
The config option debug_and_release is set on Windows and on mac (unless xcode is used independently of whether Qt is configured with -release or not.) We need to check CONFIG(release,debug|release) to see if -release was set. Change-Id: Ibf952958874f6b102981526b3397e848c207a3f2 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
-rw-r--r--mkspecs/features/create_cmake.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index b8809a236b..a7c9110af0 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -113,8 +113,8 @@ macx {
CMAKE_DEBUG_TYPE =
CMAKE_RELEASE_TYPE =
-debug_and_release|debug:CMAKE_DEBUG_TYPE = debug
-debug_and_release|release:CMAKE_RELEASE_TYPE = release
+debug_and_release:CONFIG(debug,debug|release):CMAKE_DEBUG_TYPE = debug
+debug_and_release|CONFIG(release,debug|release):CMAKE_RELEASE_TYPE = release
INSTALLS += cmake_qt5_module_files