diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-02-27 16:45:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 21:07:16 +0100 |
| commit | 018e78575c6f7f5a90b41274468a26b09b909443 (patch) | |
| tree | e9a323ccbe95bc2b132dd640646a7431d1290b75 /src/widgets/Qt5WidgetsConfigExtras.cmake.in | |
| parent | c7a059e376bd0105ad470017a774715b112de8b4 (diff) | |
Make the CMake files work with directory overrides.
This allows us to create correct CMake config files when Qt is
configured with directories outside of the prefix (which Qt allows),
and also allows us to use correct values when a 'longer' relative
lib directory is used such as lib/x86_64-linux-gnu.
Change-Id: I6f88255a23752dc5b84cb20ce13fdeeee9d5ad51
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/widgets/Qt5WidgetsConfigExtras.cmake.in')
| -rw-r--r-- | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in index baf34b2fbc..93d3c6998a 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -1,5 +1,8 @@ get_filename_component(_qt5_widgets_install_prefix ${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR} ABSOLUTE) -# Not Required by default: -set(QT_UIC_EXECUTABLE \"${_qt5_widgets_install_prefix}/$$CMAKE_BIN_DIR/uic$$CMAKE_BIN_SUFFIX\") +!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +set(QT_UIC_EXECUTABLE \"${_qt5_widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") +!!ELSE +set(QT_UIC_EXECUTABLE \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") +!!ENDIF |