From 7ec029d28e715c3c8826b1aea0b1a3afe53de603 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Thu, 14 Jun 2007 13:55:06 +0000 Subject: [PATCH] some more changes --- src/CMakeLists.txt | 7 +++++-- {test => src/test}/CMakeLists.txt | 6 +++--- {test => src/test}/exampletest.cpp | 0 {test => src/test}/geneordertest.cpp | 0 {test => src/test}/main.cpp | 0 {test => src/test}/qtmain.cpp | 0 6 files changed, 8 insertions(+), 5 deletions(-) rename {test => src/test}/CMakeLists.txt (63%) rename {test => src/test}/exampletest.cpp (100%) rename {test => src/test}/geneordertest.cpp (100%) rename {test => src/test}/main.cpp (100%) rename {test => src/test}/qtmain.cpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 102a11b..ce189d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,9 @@ SET(CMAKE_VERBOSE_MAKEFILE OFF) ADD_DEFINITIONS(-Wall -O2) INCLUDE_DIRECTORIES(.) -ADD_EXECUTABLE(../bin/genesort main.cpp geneorder.cpp) +ADD_LIBRARY(GeneSort geneorder) +ADD_EXECUTABLE(../bin/genesort main.cpp) -TARGET_LINK_LIBRARIES(../bin/genesort doublefann) +TARGET_LINK_LIBRARIES(../bin/genesort doublefann GeneSort) + +SUBDIRS(test) diff --git a/test/CMakeLists.txt b/src/test/CMakeLists.txt similarity index 63% rename from test/CMakeLists.txt rename to src/test/CMakeLists.txt index 0810962..fa36e96 100644 --- a/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-Wall -O2) find_package(Qt3 REQUIRED) -INCLUDE_DIRECTORIES(. ../src ${QT_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR}) link_directories(${QT_LIB_DIR}) add_definitions(${QT_DEFINITIONS}) @@ -16,5 +16,5 @@ ADD_EXECUTABLE(tester main ${TESTSRC}) ADD_EXECUTABLE(qttester qtmain ${TESTSRC}) -TARGET_LINK_LIBRARIES(tester cppunit) -TARGET_LINK_LIBRARIES(qttester cppunit qttestrunnerd ${QT_LIBRARIES}) +TARGET_LINK_LIBRARIES(tester GeneSort cppunit) +TARGET_LINK_LIBRARIES(qttester GeneSort cppunit qttestrunnerd ${QT_LIBRARIES}) diff --git a/test/exampletest.cpp b/src/test/exampletest.cpp similarity index 100% rename from test/exampletest.cpp rename to src/test/exampletest.cpp diff --git a/test/geneordertest.cpp b/src/test/geneordertest.cpp similarity index 100% rename from test/geneordertest.cpp rename to src/test/geneordertest.cpp diff --git a/test/main.cpp b/src/test/main.cpp similarity index 100% rename from test/main.cpp rename to src/test/main.cpp diff --git a/test/qtmain.cpp b/src/test/qtmain.cpp similarity index 100% rename from test/qtmain.cpp rename to src/test/qtmain.cpp -- 2.39.2