Do not pass -DBOOST_TEST_DYN_LINK to pulseview

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2448a32f3e00229897925fac339ef90bfe479586..cea8b744f7a2e67e132983da357db9366a715f46 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,9 @@ find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 #= Config Header
 #-------------------------------------------------------------------------------
 
+set(PV_TITLE PulseView)
+set(PV_DESCRIPTION "A GUI for sigrok")
+
 set(PV_VERSION_MAJOR 0)
 set(PV_VERSION_MINOR 1)
 set(PV_VERSION_MICRO 0)
@@ -111,13 +114,6 @@ set(pulseview_RESOURCES
        pulseview.qrc
 )
 
-set(pulseview_TEST_SOURCES
-       pv/datasnapshot.cpp
-       pv/logicdatasnapshot.cpp
-       test/logicdatasnapshot.cpp
-       test/test.cpp
-)
-
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
@@ -136,6 +132,7 @@ add_definitions(${QT_DEFINITIONS})
 
 include_directories(
        ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_CURRENT_SOURCE_DIR}
        ${Boost_INCLUDE_DIRS}
 )
 
@@ -164,36 +161,27 @@ else()
        list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
 endif()
 
-add_executable(pulseview
+add_executable(${PROJECT_NAME}
        ${pulseview_SOURCES}
        ${pulseview_HEADERS_MOC}
        ${pulseview_FORMS_HEADERS}
        ${pulseview_RESOURCES_RCC}
 )
 
-target_link_libraries(pulseview ${PULSEVIEW_LINK_LIBS})
+target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
 
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------
 
-install(PROGRAMS pulseview DESTINATION bin/)
+install(PROGRAMS ${PROJECT_NAME} DESTINATION bin/)
 
 #===============================================================================
 #= Tests
 #-------------------------------------------------------------------------------
 
 if(ENABLE_TESTS)
-
-       add_definitions(-DBOOST_TEST_DYN_LINK)
-
-       add_executable(pulseview-test
-               ${pulseview_TEST_SOURCES}
-       )
-
-       target_link_libraries(pulseview-test ${PULSEVIEW_LINK_LIBS})
-
+       add_subdirectory(test)
        enable_testing()
-       add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
-
+       add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test)
 endif(ENABLE_TESTS)