# HG changeset patch # User Tom Fredrik Blenning Klaussen # Date 1381362547 -7200 # Node ID 114be42a612ce6f898e63521caaff7ff276967e3 # Parent 9744ec195be3c69f05c0ff2466c68252b02d9c54 Make a library. diff -r 9744ec195be3 -r 114be42a612c CMakeLists.txt --- a/CMakeLists.txt Thu Oct 10 01:07:52 2013 +0200 +++ b/CMakeLists.txt Thu Oct 10 01:49:07 2013 +0200 @@ -13,9 +13,9 @@ MACRO(NEW_TEST file) STRING(REPLACE "/" "_" TARGET ${file}) - ADD_EXECUTABLE(${TARGET} ${file}.cpp ${TEST_SOURCES}) + ADD_EXECUTABLE(${TARGET} ${file}.cpp) ADD_TEST(${TARGET} ${TARGET}) - TARGET_LINK_LIBRARIES(${TARGET} ${QT_LIBRARIES} ${Boost_LIBRARIES} + TARGET_LINK_LIBRARIES(${TARGET} TestDeDupe ${QT_LIBRARIES} ${Boost_LIBRARIES} ${COVERAGE_FLAGS}) ADD_CUSTOM_COMMAND(OUTPUT "BUILD_${TARGET}" @@ -116,11 +116,15 @@ ${MOC_SOURCES} ) +SET(EXTRA_TEST_SOURCES + TestDataBase.cpp + TestFramework.cpp +) + SET(TEST_SOURCES ${CLASS_SOURCES} ${MOC_SOURCES} - TestDataBase.cpp - TestFramework.cpp + ${EXTRA_TEST_SOURCES} ) @@ -144,8 +148,27 @@ ADD_DEFINITIONS(${COVERAGE_FLAGS}) SET(CMAKE_EXE_LINKER_FLAGS "${COVERAGE_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") -ADD_EXECUTABLE(DeDupe Apps/DeDupe.cpp ${SOURCES} ${MOC_SOURCES}) +ADD_LIBRARY(DeDupe ${SOURCES} ${MOC_SOURCES}) +TARGET_LINK_LIBRARIES( + DeDupe + ${QT_LIBRARIES} + ${SQLITE3_LIBRARIES} + ${Boost_LIBRARIES} +) + +ADD_LIBRARY(TestDeDupe SHARED ${EXTRA_TEST_SOURCES}) TARGET_LINK_LIBRARIES( + TestDeDupe + DeDupe + ${QT_LIBRARIES} + ${SQLITE3_LIBRARIES} + ${Boost_LIBRARIES} +) + +#ADD_EXECUTABLE(DeDupe.App Apps/DeDupe.cpp ${SOURCES} ${MOC_SOURCES}) +ADD_EXECUTABLE(DeDupe.App Apps/DeDupe.cpp) +TARGET_LINK_LIBRARIES( + DeDupe.App DeDupe ${QT_LIBRARIES} ${SQLITE3_LIBRARIES} @@ -155,10 +178,10 @@ ADD_EXECUTABLE( updateDeDupe Apps/updateDeDupe.cpp - ${SOURCES} ${MOC_SOURCES} ) TARGET_LINK_LIBRARIES( updateDeDupe + DeDupe ${QT_LIBRARIES} ${SQLITE3_LIBRARIES} ${Boost_LIBRARIES}