diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-05-15 23:21:01 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-05-15 23:21:01 (GMT) |
| commit | f8f4140b6ca1d7f1944514741f61aaf631b59115 (patch) | |
| tree | b5cb3b3b79515727c503194c0f639298a98826b1 /Source/QtDialog/CMakeLists.txt | |
| parent | 3e6decf31205ecfcbe837c0d0344f4597aa33369 (diff) | |
| download | CMake-f8f4140b6ca1d7f1944514741f61aaf631b59115.zip CMake-f8f4140b6ca1d7f1944514741f61aaf631b59115.tar.gz CMake-f8f4140b6ca1d7f1944514741f61aaf631b59115.tar.bz2 | |
ENH: Add cross compiling support in the GUI in the same dialog that prompts for
the generator on the first configure. It either ask for a toolchain file
or asks for all the information a toolchain file might contain.
Also added option for setting non-default compilers if not cross compiling.
Fixes #6849.
Also a bit of code cleanup and re-organizing.
Diffstat (limited to 'Source/QtDialog/CMakeLists.txt')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 37f96ed..b74987e 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT(QtDialog) -SET(QT_MIN_VERSION "4.2.0") +SET(QT_MIN_VERSION "4.3.0") FIND_PACKAGE(Qt4 REQUIRED) IF(NOT QT4_FOUND) @@ -16,6 +16,8 @@ ELSE(NOT QT4_FOUND) SET(SRCS AddCacheEntry.cxx AddCacheEntry.h + CMakeFirstConfigure.cxx + CMakeFirstConfigure.h CMakeSetup.cxx CMakeSetupDialog.cxx CMakeSetupDialog.h @@ -23,19 +25,24 @@ ELSE(NOT QT4_FOUND) QCMake.h QCMakeCacheView.cxx QCMakeCacheView.h + QCMakeWidgets.cxx + QCMakeWidgets.h QMacInstallDialog.cxx QMacInstallDialog.h ) QT4_WRAP_UI(UI_SRCS + CMakeFirstConfigure.ui CMakeSetupDialog.ui AddCacheEntry.ui MacInstallDialog.ui ) QT4_WRAP_CPP(MOC_SRCS AddCacheEntry.h + CMakeFirstConfigure.h CMakeSetupDialog.h QCMake.h QCMakeCacheView.h + QCMakeWidgets.h QMacInstallDialog.h ) QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc) |