summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorFranck Bettinger <bettingf@cs.man.ac.uk>2002-09-12 15:37:16 (GMT)
committerFranck Bettinger <bettingf@cs.man.ac.uk>2002-09-12 15:37:16 (GMT)
commit6b9d82f41d6fcfa6661c4afd0eb22e0bddc64eb8 (patch)
treef9ee4dbecc53ab995cb4554d4668de01db2dae9c /Tests
parent32b398e55b4d898f5e50fe113255a16ba1e2d61d (diff)
downloadCMake-6b9d82f41d6fcfa6661c4afd0eb22e0bddc64eb8.zip
CMake-6b9d82f41d6fcfa6661c4afd0eb22e0bddc64eb8.tar.gz
CMake-6b9d82f41d6fcfa6661c4afd0eb22e0bddc64eb8.tar.bz2
corrected test for QTWrapUI
Diffstat (limited to 'Tests')
-rw-r--r--Tests/Wrapping/CMakeLists.txt9
-rw-r--r--Tests/Wrapping/qtwrappingmain.cxx4
2 files changed, 6 insertions, 7 deletions
diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt
index e09a015..7d615bb 100644
--- a/Tests/Wrapping/CMakeLists.txt
+++ b/Tests/Wrapping/CMakeLists.txt
@@ -27,7 +27,7 @@ ENDIF (EXECUTABLE_OUTPUT_PATH)
# Add exe
#
ADD_EXECUTABLE (wrapping wrapping.cxx)
-ADD_EXECUTABLE (qtwrappingmain qtwrappingmain.cxx QTUI_S_SRCS)
+ADD_EXECUTABLE (qtwrapping qtwrappingmain.cxx QTUI_S_SRCS)
#
# Test VTK wrappers
@@ -81,14 +81,15 @@ CONFIGURE_FILE(
# QT Wrappers
#
+SET (QT_WRAP_CPP "On")
+SET (QT_MOC_EXE "echo")
+
INCLUDE( ../../Modules/FindQt.cmake )
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ./ )
LINK_LIBRARIES( ${QT_LIBRARIES} )
-SET (QT_WRAP_CPP "On")
-SET (QT_MOC_EXE "echo")
QT_WRAP_CPP (wraplibQT QT_SRCS SRCS)
SET (QT_WRAP_UI "On")
@@ -96,7 +97,7 @@ SET (QT_UIC_EXE "echo")
SET (QTUI_SRCS
qtwrapping.ui
)
-QT_WRAP_UI (qtwrappingmain QTUI_H_SRCS QTUI_S_SRCS QTUI_SRCS)
+QT_WRAP_UI (qtwrapping QTUI_H_SRCS QTUI_S_SRCS QTUI_SRCS)
#
# FLTK Wrappers
diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx
index bf67800..81ddaf4 100644
--- a/Tests/Wrapping/qtwrappingmain.cxx
+++ b/Tests/Wrapping/qtwrappingmain.cxx
@@ -8,8 +8,6 @@ QApplication app(argc,argv);
qtwrapping qtw;
app.setMainWidget(&qtw);
-qtw.show();
-int ret=app.exec();
-return ret;
+return 0;
}