X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=4f8665f7d753f8a1618045460e12ed991ba806bf;hp=3adb9675c620ce287db1ae07fa2edb286b2d02d1;hb=cd6c8ee24fe845fc7d4fcbf8672bb8cdd3afea1a;hpb=30588653813298efbf329cb542cf03bf78320380

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3adb9675..4f8665f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,19 @@ include(FindPkgConfig)
 
 project(pulseview)
 
+#===============================================================================
+#= User Options
+#-------------------------------------------------------------------------------
+
+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
 #-------------------------------------------------------------------------------
@@ -36,12 +49,30 @@ pkg_check_modules(PKGDEPS 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)
 
-set(VERSION 0.1.0)
+find_package(Boost 1.46)
+
+#===============================================================================
+#= 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
@@ -61,6 +92,7 @@ set(pulseview_SOURCES
 	pv/signal.cpp
 	pv/view/header.cpp
 	pv/view/ruler.cpp
+	pv/view/timemarker.cpp
 	pv/view/view.cpp
 	pv/view/viewport.cpp
 )
@@ -84,13 +116,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})
@@ -102,102 +127,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)