Fix the use of if() inside of macro().
authorStephen Kelly <stephen.kelly@kdab.com>
Wed, 11 Jul 2012 09:25:59 +0000 (11:25 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 16 Jul 2012 12:22:55 +0000 (14:22 +0200)
if() seems to behave differently with macro parameters compared to
variables set with set().

Change-Id: Ieb9544b8c3187579fd4cfe25e2c2afa3f349eba6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
mkspecs/cmake/Qt5BasicConfig.cmake.in

index 4014c9d..212a186 100644 (file)
@@ -126,7 +126,7 @@ macro(_populate_imported_target_properties Configuration LIB_LOCATION IMPLIB_LOC
         \"IMPORTED_SONAME_${Configuration}\" "$${CMAKE_LIB_SONAME}"
 !!ENDIF
     )
-    if(IMPLIB_LOCATION)
+    if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
         set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
             \"IMPORTED_IMPLIB_${Configuration}\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\"