ENH: remove findqt3 from cmake's cmakelist files
This commit is contained in:
parent
676320f161
commit
dcf21dd90b
|
@ -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"
|
--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
|
ADD_TEST(qtwrapping ${CMAKE_CTEST_COMMAND}
|
||||||
# older version of cmake
|
--build-and-test
|
||||||
INCLUDE (${CMAKE_SOURCE_DIR}/Modules/FindQt3.cmake)
|
"${CMake_SOURCE_DIR}/Tests/Wrapping"
|
||||||
MARK_AS_ADVANCED(
|
"${CMake_BINARY_DIR}/Tests/Wrapping"
|
||||||
QT_INCLUDE_PATH
|
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||||
QT_MOC_EXE
|
--build-project Wrapping
|
||||||
QT_QT_LIBRARY
|
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||||
QT_UIC_EXE)
|
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
|
||||||
|
|
||||||
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"
|
|
||||||
--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
|
||||||
|
|
|
@ -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)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
int main(int ac, char** av)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue