diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-09-24 21:51:13 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-09-24 21:51:13 (GMT) |
| commit | 8102451c01f2d36edecf123b43ff15968ff134ba (patch) | |
| tree | e4269bbbb23e5d0e0d5432ecaea2ee431900e5d5 /Tests | |
| parent | c968abd2c1796e85bd935fe0149489c52abb06e7 (diff) | |
| download | CMake-8102451c01f2d36edecf123b43ff15968ff134ba.zip CMake-8102451c01f2d36edecf123b43ff15968ff134ba.tar.gz CMake-8102451c01f2d36edecf123b43ff15968ff134ba.tar.bz2 | |
ENH: Better testing
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Wrapping/CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt index 874505a..7a74826 100644 --- a/Tests/Wrapping/CMakeLists.txt +++ b/Tests/Wrapping/CMakeLists.txt @@ -38,8 +38,8 @@ SET(WRAP ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/Wrap${EXE_EXT}) # Test VTK wrappers # SET (SRCS - vtkExcluded - vtkIncluded + vtkExcluded.cxx + vtkIncluded.cxx ) WRAP_EXCLUDE_FILES ( @@ -106,22 +106,26 @@ IF (QT_FOUND) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) - QT_WRAP_CPP (wraplibQT QT_SRCS SRCS) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/foo.ui.in - ${CMAKE_CURRENT_BINARY_DIR}/foo.ui) + ${CMAKE_CURRENT_BINARY_DIR}/foo.ui IMMEDIATE) SET (QT_WRAP_UI "On") SET (QT_UIC_EXE "${QT_UIC_EXECUTABLE}") + + SET (QTUI_SRCS qtwrapping.ui ${CMAKE_CURRENT_BINARY_DIR}/foo.ui ) - QT_WRAP_UI (qtwrapping QTUI_H_SRCS QTUI_S_SRCS QTUI_SRCS) + QT_WRAP_UI (myqtlib QTUI_H_SRCS QTUI_S_SRCS ${QTUI_SRCS}) + QT_WRAP_CPP (myqtlib QT_MOC_SRCS ${SRCS}) MESSAGE("QT files are ${QTUI_S_SRCS}") MESSAGE("QT other files are ${QTUI_H_SRCS}") ADD_DEFINITIONS(${QT_DEFINITIONS}) - ADD_EXECUTABLE (qtwrapping qtwrappingmain.cxx QTUI_S_SRCS) + ADD_LIBRARY(myqtlib ${QTUI_S_SRCS} ${QT_MOC_SRCS}) + ADD_EXECUTABLE (qtwrapping qtwrappingmain.cxx) + TARGET_LINK_LIBRARIES(qtwrapping myqtlib) TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} ) ENDIF (QT_FOUND) |