diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-11-02 14:46:03 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-11-02 14:46:03 (GMT) |
| commit | dcf21dd90b816d06b43716ce96e496fe3d591594 (patch) | |
| tree | fcc3bb087a5d592b151ce240480beb9763b8f872 | |
| parent | 676320f161396a4c5bb36f2def303b6ec637f696 (diff) | |
| download | CMake-dcf21dd90b816d06b43716ce96e496fe3d591594.zip CMake-dcf21dd90b816d06b43716ce96e496fe3d591594.tar.gz CMake-dcf21dd90b816d06b43716ce96e496fe3d591594.tar.bz2 | |
ENH: remove findqt3 from cmake's cmakelist files
| -rw-r--r-- | Tests/CMakeLists.txt | 27 | ||||
| -rw-r--r-- | Tests/Wrapping/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Wrapping/qtnoqtmain.cxx | 5 |
3 files changed, 15 insertions, 19 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 728f906..dba0075 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -333,27 +333,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin" --test-command wrapping ) - # use the FindQt3.cmake from this cmake as it may not be in an - # older version of cmake - INCLUDE (${CMAKE_SOURCE_DIR}/Modules/FindQt3.cmake) - MARK_AS_ADVANCED( - QT_INCLUDE_PATH - QT_MOC_EXE - QT_QT_LIBRARY - QT_UIC_EXE) - - IF (QT_FOUND AND QT_WRAP_UI) - ADD_TEST(qtwrapping ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/Wrapping" - "${CMake_BINARY_DIR}/Tests/Wrapping" - --build-generator ${CMAKE_TEST_GENERATOR} - --build-project Wrapping - --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin" + ADD_TEST(qtwrapping ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/Wrapping" + "${CMake_BINARY_DIR}/Tests/Wrapping" + --build-generator ${CMAKE_TEST_GENERATOR} + --build-project Wrapping + --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} + --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin" --test-command qtwrapping ) - ENDIF (QT_FOUND AND QT_WRAP_UI) ADD_TEST(testdriver1 ${CMAKE_CTEST_COMMAND} --build-and-test diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt index 2aa97bc..1f35e55 100644 --- a/Tests/Wrapping/CMakeLists.txt +++ b/Tests/Wrapping/CMakeLists.txt @@ -74,6 +74,8 @@ IF (QT_FOUND AND QT_WRAP_UI) TARGET_LINK_LIBRARIES(qtwrapping myqtlib) TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} ) +ELSE (QT_FOUND AND QT_WRAP_UI) + ADD_EXECUTABLE (qtwrapping qtnoqtmain.cxx) ENDIF (QT_FOUND AND QT_WRAP_UI) # diff --git a/Tests/Wrapping/qtnoqtmain.cxx b/Tests/Wrapping/qtnoqtmain.cxx new file mode 100644 index 0000000..8b7334a --- /dev/null +++ b/Tests/Wrapping/qtnoqtmain.cxx @@ -0,0 +1,5 @@ +int main(int ac, char** av) +{ + return 0; +} + |