projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved pv::About into the pv::dialogs::About namespace
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index c6459353b62a63f19e757e10e93075961217cd6a..e1893b6c1c47a90edd29434b7de4f5e236a22889 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-28,11
+28,11
@@
project(pulseview)
#-------------------------------------------------------------------------------
option(ENABLE_TESTS "Enable unit tests" FALSE)
#-------------------------------------------------------------------------------
option(ENABLE_TESTS "Enable unit tests" FALSE)
-option(STATIC_PKGDEPS_LIBS "Statically link to
sigrok
libraries" FALSE)
+option(STATIC_PKGDEPS_LIBS "Statically link to
(pkgconfig)
libraries" FALSE)
if(WIN32)
if(WIN32)
- # On Windows/MinGW we need to statically link to libraries
- # This option is user configurable, but enable it by default on 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()
set(STATIC_PKGDEPS_LIBS TRUE)
endif()
@@
-46,18
+46,22
@@
pkg_check_modules(PKGDEPS REQUIRED
libsigrok>=0.2.0
)
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)
# 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)
#===============================================================================
#= Config Header
#-------------------------------------------------------------------------------
#===============================================================================
#= 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_MAJOR 0)
set(PV_VERSION_MINOR 1)
set(PV_VERSION_MICRO 0)
@@
-76,48
+80,48
@@
configure_file (
set(pulseview_SOURCES
main.cpp
set(pulseview_SOURCES
main.cpp
- pv/about.cpp
+ pv/analogdata.cpp
+ pv/analogdatasnapshot.cpp
pv/datasnapshot.cpp
pv/logicdata.cpp
pv/logicdatasnapshot.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/mainwindow.cpp
pv/samplingbar.cpp
pv/signaldata.cpp
pv/sigsession.cpp
- pv/signal.cpp
+ pv/dialogs/about.cpp
+ pv/view/analogsignal.cpp
+ pv/view/cursor.cpp
pv/view/header.cpp
pv/view/header.cpp
+ pv/view/logicsignal.cpp
pv/view/ruler.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/view/view.cpp
pv/view/viewport.cpp
)
set(pulseview_HEADERS
- pv/about.h
pv/mainwindow.h
pv/samplingbar.h
pv/sigsession.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/header.h
pv/view/ruler.h
+ pv/view/timemarker.h
pv/view/view.h
pv/view/viewport.h
)
set(pulseview_FORMS
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_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})
qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
@@
-129,6
+133,7
@@
include(${QT_USE_FILE})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
+add_definitions(-Werror -Wall)
#===============================================================================
#= Global Include Directories
#===============================================================================
#= Global Include Directories
@@
-165,36
+170,27
@@
else()
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
endif()
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}
)
${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
#-------------------------------------------------------------------------------
#===============================================================================
#= Installation
#-------------------------------------------------------------------------------
-install(PROGRAMS
pulseview
DESTINATION bin/)
+install(PROGRAMS
${PROJECT_NAME}
DESTINATION bin/)
#===============================================================================
#= Tests
#-------------------------------------------------------------------------------
if(ENABLE_TESTS)
#===============================================================================
#= 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()
enable_testing()
- add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
-
+ add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test)
endif(ENABLE_TESTS)
endif(ENABLE_TESTS)