From 40474ceb11fd10a03c28ed3fa2836bcd2fd66929 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 19 Dec 2012 16:34:10 +0100 Subject: Fix the computation of the location of mkspecs. The location of the mkspecs directory comes from the archdatadir, which distros will all set. Change-Id: I20dbdce76db13dbd37eec065009e215f98985907 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/Qt5CoreConfigExtras.cmake.in') diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index 0df27039d0..06ff6dc831 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -43,10 +43,10 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake) set(Qt5Core_MOC_EXECUTABLE Qt5::moc) set(Qt5Core_RCC_EXECUTABLE Qt5::rcc) -!!IF isEmpty(CMAKE_DATA_DIR_IS_ABSOLUTE) -list(APPEND Qt5Core_INCLUDE_DIRS \"${_qt5_corelib_install_prefix}/mkspecs/$${CMAKE_MKSPEC}\") +!!IF isEmpty(CMAKE_ARCHDATA_DIR_IS_ABSOLUTE) +list(APPEND Qt5Core_INCLUDE_DIRS \"${_qt5_corelib_install_prefix}/$${CMAKE_ARCHDATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") !!ELSE -list(APPEND Qt5Core_INCLUDE_DIRS \"$${CMAKE_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") +list(APPEND Qt5Core_INCLUDE_DIRS \"$${CMAKE_ARCHDATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF !!IF !isEmpty(CMAKE_ADD_FPIE_FLAGS) -- cgit v1.2.3