From 1e469bac11162a1ccb3e6bf2f5b4b6a8bbd235b6 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 4 Jul 2012 10:11:07 +0200 Subject: 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 Reviewed-by: Stephen Kelly --- mkspecs/cmake/Qt5BasicConfig.cmake.in | 3 +++ mkspecs/features/create_cmake.prf | 1 + 2 files changed, 4 insertions(+) (limited to 'mkspecs') 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 @@ -121,6 +121,9 @@ macro(_populate_imported_target_properties Configuration LIB_LOCATION IMPLIB_LOC \"IMPORTED_LOCATION_${Configuration}\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\" !!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) 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) } } -- cgit v1.2.3