diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-02-21 19:45:05 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 19:25:06 +0100 |
| commit | 4d0d49a92cca46555a5e3ed482b7d7f50ea3655a (patch) | |
| tree | 0a6d9e5cb6441c063e95e65c8ced9a34156af5a7 /src | |
| parent | 194898bab9a02c442627714af569c8fa4d981df2 (diff) | |
Use QMAKE_SUBSTITUTIONS conditionals
Instead of generating CMake conditionals.
Change-Id: I3d987cc08666270e618222be9292558e73bc961e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt5CoreConfigExtras.cmake.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index 37af42d6bd..41dbf2c2a2 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -8,11 +8,11 @@ set(QT_RCC_EXECUTABLE \"${_qt5_corelib_install_prefix}/$$CMAKE_BIN_DIR/rcc$$CMAK list(APPEND Qt5Core_INCLUDE_DIRS \"${_qt5_corelib_install_prefix}/mkspecs/default\") -if (NOT \"$${CMAKE_ADD_FPIE_FLAGS}\" STREQUAL \"\") - set(Qt5Core_EXECUTABLE_COMPILE_FLAGS "-fPIE") -endif() +!!IF !isEmpty(CMAKE_ADD_FPIE_FLAGS) +set(Qt5Core_EXECUTABLE_COMPILE_FLAGS "-fPIE") +!!ENDIF -if (NOT \"$$QT_NAMESPACE\" STREQUAL \"\") - list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE) - list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE) -endif() +!!IF !isEmpty(QT_NAMESPACE) +list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE) +list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE) +!!ENDIF |