diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2007-11-03 14:30:52 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2007-11-03 14:30:52 (GMT) |
| commit | 77ad85a6ab00959b972f5f2ad86382e2161b92b6 (patch) | |
| tree | dffe50dd916306eefcefd39e0f7fb20dc375bc27 /Source/QtDialog/CMakeLists.txt | |
| parent | c139a096c7cb73a8184b69f20a837d97c00b5a96 (diff) | |
| download | CMake-77ad85a6ab00959b972f5f2ad86382e2161b92b6.zip CMake-77ad85a6ab00959b972f5f2ad86382e2161b92b6.tar.gz CMake-77ad85a6ab00959b972f5f2ad86382e2161b92b6.tar.bz2 | |
ENH: Add interrupt button near progress bar.
Implement help button.
Implement cancel button.
Add scrollable output window.
Replace ON/OFF & combobox editors with checkboxes.
Tab/backtab in cache table jumps between values (not names and values)
Add tooltips to show help strings.
Add application icon and qtmain for Windows.
BUG: Fix save of cache values on configure.
Diffstat (limited to 'Source/QtDialog/CMakeLists.txt')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 540887c..81c36cf 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -6,7 +6,6 @@ IF(NOT QT4_FOUND) MESSAGE(SEND_ERROR "Failed to find Qt 4.3 or greater.") ELSE(NOT QT4_FOUND) - SET(QT_USE_QTMAIN TRUE) INCLUDE(${QT_USE_FILE}) SET(SRCS @@ -18,7 +17,6 @@ ELSE(NOT QT4_FOUND) QCMakeCacheView.cxx QCMakeCacheView.h ) - QT4_WRAP_UI(UI_SRCS CMakeSetupDialog.ui ) @@ -30,13 +28,16 @@ ELSE(NOT QT4_FOUND) QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc) SET(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS}) + IF(WIN32) + SET(SRCS ${SRCS} CMakeSetup.rc) + ENDIF(WIN32) + # TODO Mac OS X icon INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_EXECUTABLE(QtDialog WIN32 MACOSX_BUNDLE ${SRCS}) - TARGET_LINK_LIBRARIES(QtDialog CMakeLib ${QT_LIBRARIES}) - ADD_DEPENDENCIES(QtDialog cmake) + TARGET_LINK_LIBRARIES(QtDialog CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}) ENDIF(NOT QT4_FOUND) |