X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=1e1716b7f512cacbf6ddd3a2199d80fef3ca5d72;hp=512ad18765509a90f6e950caa471c2f70095f742;hb=24bb0bd140f7f8b00ea3c0cbe0c5d26dc03a3b69;hpb=506523c1f161152fe4eab0f7b72374fd07078c31 diff --git a/CMakeLists.txt b/CMakeLists.txt index 512ad187..1e1716b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,13 @@ project(pulseview) #------------------------------------------------------------------------------- option(ENABLE_TESTS "Enable unit tests" FALSE) +option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE) + +if(WIN32) + # On Windows/MinGW we need to statically link to libraries. + # This option is user configurable, but enable it by default on win32. + set(STATIC_PKGDEPS_LIBS TRUE) +endif() #=============================================================================== #= Dependencies @@ -39,15 +46,33 @@ pkg_check_modules(PKGDEPS REQUIRED libsigrok>=0.2.0 ) +find_package(Qt4 REQUIRED) + # On Windows/MinGW we explicitly point cmake to the Boost directory. if(WIN32) set(BOOST_ROOT /usr/local) -endif(WIN32) +endif() -find_package(Qt4 REQUIRED) -find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED) +find_package(Boost 1.46 COMPONENTS system thread) -set(VERSION 0.1.0) +#=============================================================================== +#= 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) +set(PV_VERSION_STRING + ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO} +) + +configure_file ( + ${PROJECT_SOURCE_DIR}/config.h.in + ${PROJECT_BINARY_DIR}/config.h +) #=============================================================================== #= Sources @@ -55,48 +80,53 @@ set(VERSION 0.1.0) set(pulseview_SOURCES main.cpp - pv/about.cpp - pv/datasnapshot.cpp - pv/logicdata.cpp - pv/logicdatasnapshot.cpp - pv/logicsignal.cpp pv/mainwindow.cpp pv/samplingbar.cpp - pv/signaldata.cpp pv/sigsession.cpp - pv/signal.cpp + pv/data/analog.cpp + pv/data/analogsnapshot.cpp + pv/data/logic.cpp + pv/data/logicsnapshot.cpp + pv/data/signaldata.cpp + pv/data/snapshot.cpp + pv/dialogs/about.cpp + pv/dialogs/hwcap.cpp + pv/prop/enum.cpp + pv/prop/property.cpp + pv/prop/binding/binding.cpp + pv/prop/binding/hwcap.cpp + pv/view/analogsignal.cpp + pv/view/cursor.cpp pv/view/header.cpp + pv/view/logicsignal.cpp pv/view/ruler.cpp + pv/view/signal.cpp + pv/view/timemarker.cpp pv/view/view.cpp pv/view/viewport.cpp ) set(pulseview_HEADERS - pv/about.h pv/mainwindow.h pv/samplingbar.h pv/sigsession.h + pv/dialogs/about.h + pv/view/cursor.h pv/view/header.h pv/view/ruler.h + pv/view/timemarker.h pv/view/view.h pv/view/viewport.h ) set(pulseview_FORMS - pv/about.ui + pv/dialogs/about.ui ) 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}) @@ -108,102 +138,64 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) -add_definitions(-DAPP_VERSION="${VERSION}") +add_definitions(-Werror -Wall) #=============================================================================== #= Global Include Directories #------------------------------------------------------------------------------- -# On Windows/MinGW we need PKGDEPS_STATIC_INCLUDE_DIRS. -if(WIN32) - include_directories( - ${include_directories} - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} - ${PKGDEPS_STATIC_INCLUDE_DIRS} - ) -else(WIN32) - include_directories( - ${include_directories} - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} - ${PKGDEPS_INCLUDE_DIRS} - ) -endif(WIN32) +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${Boost_INCLUDE_DIRS} +) + +if(STATIC_PKGDEPS_LIBS) + include_directories(${PKGDEPS_STATIC_INCLUDE_DIRS}) +else() + include_directories(${PKGDEPS_INCLUDE_DIRS}) +endif() #=============================================================================== #= Linker Configuration #------------------------------------------------------------------------------- -# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARY_DIRS. -if(WIN32) - link_directories( - ${Boost_LIBRARY_DIRS} - ${PKGDEPS_STATIC_LIBRARY_DIRS} - ) -else(WIN32) - link_directories( - ${Boost_LIBRARY_DIRS} - ${PKGDEPS_LIBRARY_DIRS} - ) -endif(WIN32) - -add_executable(pulseview +link_directories(${Boost_LIBRARY_DIRS}) + +set(PULSEVIEW_LINK_LIBS + ${Boost_LIBRARIES} + ${QT_LIBRARIES} +) + +if(STATIC_PKGDEPS_LIBS) + link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS}) + list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES}) +else() + link_directories(${PKGDEPS_LIBRARY_DIRS}) + list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES}) +endif() + +add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} ${pulseview_FORMS_HEADERS} ${pulseview_RESOURCES_RCC} ) -# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES. -if(WIN32) - target_link_libraries(pulseview - ${Boost_LIBRARIES} - ${PKGDEPS_STATIC_LIBRARIES} - ${QT_LIBRARIES} - ) -else(WIN32) - target_link_libraries(pulseview - ${Boost_LIBRARIES} - ${PKGDEPS_LIBRARIES} - ${QT_LIBRARIES} - ) -endif(WIN32) +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} - ) - - # On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES. - if(WIN32) - target_link_libraries(pulseview-test - ${Boost_LIBRARIES} - ${PKGDEPS_STATIC_LIBRARIES} - ${QT_LIBRARIES} - ) - else(WIN32) - target_link_libraries(pulseview-test - ${Boost_LIBRARIES} - ${PKGDEPS_LIBRARIES} - ${QT_LIBRARIES} - ) - endif(WIN32) - + 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)