From f88212c22f7e4bec261130a6f82294adfc75abca Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 20 Apr 2012 19:43:00 +0200 Subject: [PATCH] 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 --- mkspecs/features/create_cmake.prf | 4 ++-- 1 file 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