From b62c9ee93f3cec43145514d5fb9b76e1e43a6b0c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Jan 2010 22:31:01 +0000 Subject: -same as in trunk: -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=/branches/KDE/4.4/kdelibs/; revision=1076826 --- modules/Qt4ConfigDependentSettings.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/Qt4ConfigDependentSettings.cmake') 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) -- cgit v1.2.1