summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-07-04 10:11:07 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-11 02:47:14 +0200
commit1e469bac11162a1ccb3e6bf2f5b4b6a8bbd235b6 (patch)
tree9e3a48ae4bedec05b1292382095dc03c99549e5f
parent8ce0ac8d0dbf2429be14db4b559a1809bab5e1be (diff)
Set the IMPORTED_SONAME for imported targets.
On windows this doesn't need to be set. On Mac I'm not sure yet on the various configurations. Change-Id: I31f191711a2ae0a1bb7221ae6e1fef377d62f1dc Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
-rw-r--r--mkspecs/cmake/Qt5BasicConfig.cmake.in3
-rw-r--r--mkspecs/features/create_cmake.prf1
2 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in
index 9124979344..4014c9d733 100644
--- a/mkspecs/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in
@@ -122,6 +122,9 @@ macro(_populate_imported_target_properties Configuration LIB_LOCATION IMPLIB_LOC
!!ELSE
\"IMPORTED_LOCATION_${Configuration}\" \"$${CMAKE_LIB_DIR}$${LIB_LOCATION}\"
!!ENDIF
+!!IF !isEmpty(CMAKE_LIB_SONAME)
+ \"IMPORTED_SONAME_${Configuration}\" "$${CMAKE_LIB_SONAME}"
+!!ENDIF
)
if(IMPLIB_LOCATION)
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index e35142257c..13bbd1000d 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -111,6 +111,7 @@ macx {
} else {
CMAKE_LIB_FILE_LOCATION_DEBUG = libQt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.so.$$eval(QT.$${MODULE}.VERSION)
CMAKE_LIB_FILE_LOCATION_RELEASE = libQt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.so.$$eval(QT.$${MODULE}.VERSION)
+ CMAKE_LIB_SONAME = libQt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.so.$$eval(QT.$${MODULE}.MAJOR_VERSION)
}
}