kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: remove findqt3 from cmake's cmakelist files

This commit is contained in:
Bill Hoffman 2007-11-02 10:46:03 -04:00
parent 676320f161
commit dcf21dd90b
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/CMakeLists.txt
View File

@ -333,16 +333,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
--test-command wrapping --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} ADD_TEST(qtwrapping ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/Wrapping" "${CMake_SOURCE_DIR}/Tests/Wrapping"
@ -353,7 +343,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
--test-command qtwrapping --test-command qtwrapping
) )
ENDIF (QT_FOUND AND QT_WRAP_UI)
ADD_TEST(testdriver1 ${CMAKE_CTEST_COMMAND} ADD_TEST(testdriver1 ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test

2
Tests/Wrapping/CMakeLists.txt
View File

@ -74,6 +74,8 @@ IF (QT_FOUND AND QT_WRAP_UI)
TARGET_LINK_LIBRARIES(qtwrapping myqtlib) TARGET_LINK_LIBRARIES(qtwrapping myqtlib)
TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} ) 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) ENDIF (QT_FOUND AND QT_WRAP_UI)
# #

5
Tests/Wrapping/qtnoqtmain.cxx Normal file
View File

@ -0,0 +1,5 @@
int main(int ac, char** av)
{
return 0;
}