diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2010-07-02 15:43:38 -0600 |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2010-07-02 15:47:07 -0600 |
| commit | b55da4c688bbf55b442908464e0f7e2e41c937a3 (patch) | |
| tree | a84028fddb99e84fd616cea6b11178b656bbc6e3 /Modules/Qt4ConfigDependentSettings.cmake | |
| parent | c3389d4ce2a8d3ee0ec1d4824a64347ded5832a0 (diff) | |
| download | cmake-b55da4c688bbf55b442908464e0f7e2e41c937a3.tar.gz | |
Add cross-compiling support to FindQt4.cmake
Diffstat (limited to 'Modules/Qt4ConfigDependentSettings.cmake')
| -rw-r--r-- | Modules/Qt4ConfigDependentSettings.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake index 51d5fd98d9..2e03716203 100644 --- a/Modules/Qt4ConfigDependentSettings.cmake +++ b/Modules/Qt4ConfigDependentSettings.cmake @@ -34,12 +34,12 @@ SET(QT_QTDBUS_LIB_DEPENDENCIES "") SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY}) -IF(WIN32) +IF(Q_WS_WIN) # On Windows, qconfig.pri has "static" for static library builds IF(QT_CONFIG MATCHES "static") SET(QT_IS_STATIC 1) ENDIF(QT_CONFIG MATCHES "static") -ELSE(WIN32) +ELSE(Q_WS_WIN) # On other platforms, check file extension to know if its static IF(QT_QTCORE_LIBRARY_RELEASE) GET_FILENAME_COMPONENT(qtcore_lib_ext "${QT_QTCORE_LIBRARY_RELEASE}" EXT) @@ -53,12 +53,12 @@ ELSE(WIN32) SET(QT_IS_STATIC 1) ENDIF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX}) ENDIF(QT_QTCORE_LIBRARY_DEBUG) -ENDIF(WIN32) +ENDIF(Q_WS_WIN) # build using shared Qt needs -DQT_DLL on Windows -IF(WIN32 AND NOT QT_IS_STATIC) +IF(Q_WS_WIN AND NOT QT_IS_STATIC) SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL) -ENDIF(WIN32 AND NOT QT_IS_STATIC) +ENDIF(Q_WS_WIN AND NOT QT_IS_STATIC) IF(NOT QT_IS_STATIC) RETURN() |