mkspecs are installed to QT_HOST_DATA instead of QT_INSTALL_ARCHDATA.

These are the same for normal builds, but differ when cross-compiling Qt.

Change-Id: I75eccc6f4b67b440a08c4aba41aabb7df686c9f9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Volker Krause 2013-04-08 13:44:21 +02:00 committed by The Qt Project
parent f6011ec528
commit e6bade8f87
2 changed files with 7 additions and 7 deletions

View File

@ -55,10 +55,10 @@ CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
CMAKE_BIN_DIR_IS_ABSOLUTE = True CMAKE_BIN_DIR_IS_ABSOLUTE = True
} }
CMAKE_ARCHDATA_DIR = $$cmakeRelativePath($$[QT_INSTALL_ARCHDATA], $$[QT_INSTALL_PREFIX]) CMAKE_HOST_DATA_DIR = $$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX])
!isEmpty(CMAKE_FORCE_ABSOLUTE_PATHS)|contains(CMAKE_ARCHDATA_DIR, "^\\.\\./.*") { # For the mkspecs !isEmpty(CMAKE_FORCE_ABSOLUTE_PATHS)|contains(CMAKE_HOST_DATA_DIR, "^\\.\\./.*") {
CMAKE_ARCHDATA_DIR = $$[QT_INSTALL_ARCHDATA]/ CMAKE_HOST_DATA_DIR = $$[QT_HOST_DATA]/
CMAKE_ARCHDATA_DIR_IS_ABSOLUTE = True CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = True
} }
static|staticlib:CMAKE_STATIC_TYPE = true static|staticlib:CMAKE_STATIC_TYPE = true

View File

@ -46,10 +46,10 @@ set_property(TARGET Qt5::Core APPEND PROPERTY
COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION
) )
!!IF isEmpty(CMAKE_ARCHDATA_DIR_IS_ABSOLUTE) !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_ARCHDATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
!!ELSE !!ELSE
set(_qt5_corelib_extra_includes \"$${CMAKE_ARCHDATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF !!ENDIF
list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes}) list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes})