diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2010-01-18 22:12:36 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2010-01-18 22:12:36 +0000 |
| commit | 4a956a832abbb1971d41375328bf71dad27a03f1 (patch) | |
| tree | 35b00050aa2ba29299f57ea73276782298b61674 /modules/Qt4ConfigDependentSettings.cmake | |
| parent | d1b7b8459f383c215f1e70d305beab8dfb1a0aa5 (diff) | |
| download | extra-cmake-modules-4a956a832abbb1971d41375328bf71dad27a03f1.tar.gz extra-cmake-modules-4a956a832abbb1971d41375328bf71dad27a03f1.tar.bz2 | |
-fix two remaining compat. issues found by the cmake devs:
-- the imported targets did not work with Qt installed as frameworks on OSX
-- if a project exported its libraries, and these libraries depend on Qt libs, but the installed FooConfig.cmake files
do not load FindQt4.cmake, this would result in unknown targets "Qt4::QtCore" etc. So now there is a switch
to enable the imported targets explicitely (what we do for KDE)
Alex
svn path=/trunk/KDE/kdelibs/; revision=1076819
Diffstat (limited to 'modules/Qt4ConfigDependentSettings.cmake')
| -rw-r--r-- | modules/Qt4ConfigDependentSettings.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake index f6062a74..d6fc2d44 100644 --- a/modules/Qt4ConfigDependentSettings.cmake +++ b/modules/Qt4ConfigDependentSettings.cmake @@ -57,9 +57,9 @@ ELSE(WIN32) # 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) - IF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX}) + IF("${qtcore_lib_ext}" STREQUAL "${CMAKE_STATIC_LIBRARY_SUFFIX}") SET(QT_IS_STATIC 1) - ENDIF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX}) + ENDIF("${qtcore_lib_ext}" STREQUAL "${CMAKE_STATIC_LIBRARY_SUFFIX}") ENDIF(QT_QTCORE_LIBRARY_RELEASE) IF(QT_QTCORE_LIBRARY_DEBUG) GET_FILENAME_COMPONENT(qtcore_lib_ext "${QT_QTCORE_LIBRARY_DEBUG}" EXT) |