From 880f73d1f0382d4ac91f54f47e1c6be0b760c393 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 23 Jul 2013 10:23:47 +0200 Subject: Use absolute path in the /usr move workaround if -libdir is specified Change-Id: I68d087b15839418008db5bf1c0c76ca303245519 Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly --- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mkspecs/features/data/cmake') diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 478d1d13d5..c4b58fe7d7 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -4,6 +4,9 @@ if (CMAKE_VERSION VERSION_LESS 2.8.3) endif() !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +!!ELSE get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) # Use original install prefix when loaded through a # cross-prefix symbolic link such as /lib -> /usr/lib. @@ -17,6 +20,7 @@ endif() unset(_realOrig) unset(_realCurr) unset(_IMPORT_PREFIX) +!!ENDIF !!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) !!ELSE -- cgit v1.2.3