X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=src%2Ftest%2FCMakeLists.txt;h=ca4fb56e9a537d2c69759938f814ce479779d5cb;hb=ca651f2fd25147f88dbb27a27bc79bedcd9e4c81;hp=fa36e9689e254d17b43224c4d3ab47bb9791e3d2;hpb=7ec029d28e715c3c8826b1aea0b1a3afe53de603;p=germs.git

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index fa36e96..ca4fb56 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -2,19 +2,25 @@ PROJECT(GeneSort)
 
 SET(CMAKE_VERBOSE_MAKEFILE OFF)
 
-ADD_DEFINITIONS(-Wall -O2)
+#ADD_DEFINITIONS(-Wall -O2)
 
-find_package(Qt3 REQUIRED)
+#ADD_DEFINITIONS(-Wall -pedantic -g -D_GLIBCXX_DEBUG)
 
-INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
-link_directories(${QT_LIB_DIR})
-add_definitions(${QT_DEFINITIONS})
 
-SET(TESTSRC geneordertest)
+
+SET(TESTSRC geneordertest genealgorithmstest modelidentifiertest
+	genesortertest componenttreetest)
 
 ADD_EXECUTABLE(tester main ${TESTSRC})
+TARGET_LINK_LIBRARIES(tester ${GENELIBS} cppunit)
+
+#find_package(Qt3)
 
-ADD_EXECUTABLE(qttester qtmain ${TESTSRC})
+IF (QT_FOUND)
+	INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+	link_directories(${QT_LIB_DIR})
+	add_definitions(${QT_DEFINITIONS})
+	ADD_EXECUTABLE(qttester qtmain ${TESTSRC})
 
-TARGET_LINK_LIBRARIES(tester GeneSort cppunit)
-TARGET_LINK_LIBRARIES(qttester GeneSort cppunit qttestrunnerd ${QT_LIBRARIES})
+	TARGET_LINK_LIBRARIES(qttester GeneSort cppunit qttestrunnerd ${QT_LIBRARIES})
+ENDIF(QT_FOUND)