X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=2b9f39d110c6df1ed402d02b0c979bf9055f4547;hp=4f8665f7d753f8a1618045460e12ed991ba806bf;hb=8eb9d311acb7ca084b588ff20a40b145f7a8b0d5;hpb=cd6c8ee24fe845fc7d4fcbf8672bb8cdd3afea1a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f8665f7..2b9f39d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 ## This file is part of the PulseView project.
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
-## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+## Copyright (C) 2012-2013 Alexandru Gagniuc <mr.nuke.me@gmail.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@ project(pulseview)
 #= User Options
 #-------------------------------------------------------------------------------
 
+option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
@@ -34,6 +35,10 @@ 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)
+
+	# For boost-thread we need two additional settings on win32:
+	set(Boost_USE_STATIC_LIBS on)
+	add_definitions(-DBOOST_THREAD_USE_LIB)
 endif()
 
 #===============================================================================
@@ -46,14 +51,19 @@ pkg_check_modules(PKGDEPS REQUIRED
 	libsigrok>=0.2.0
 )
 
-# On Windows/MinGW we explicitly point cmake to the Boost directory.
-if(WIN32)
-	set(BOOST_ROOT /usr/local)
-endif()
-
 find_package(Qt4 REQUIRED)
 
-find_package(Boost 1.46)
+# Find the platform's thread library (needed for boost-thread).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads)
+
+if(WIN32)
+# On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'.
+# The library is named libboost_thread_win32* (not libboost_thread*).
+find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED)
+else()
+find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+endif()
 
 #===============================================================================
 #= Config Header
@@ -80,36 +90,53 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
-	pv/about.cpp
-	pv/datasnapshot.cpp
-	pv/logicdata.cpp
-	pv/logicdatasnapshot.cpp
-	pv/logicsignal.cpp
+	signalhandler.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/connect.cpp
+	pv/dialogs/deviceoptions.cpp
+	pv/prop/double.cpp
+	pv/prop/enum.cpp
+	pv/prop/property.cpp
+	pv/prop/binding/binding.cpp
+	pv/prop/binding/deviceoptions.cpp
+	pv/toolbars/samplingbar.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
+	signalhandler.h
 	pv/mainwindow.h
-	pv/samplingbar.h
 	pv/sigsession.h
+	pv/dialogs/about.h
+	pv/dialogs/connect.h
+	pv/dialogs/deviceoptions.h
+	pv/toolbars/samplingbar.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
@@ -127,7 +154,11 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
-add_definitions(-Werror -Wall)
+add_definitions(-Wall -Wextra)
+
+if(NOT DISABLE_WERROR)
+	add_definitions(-Werror)
+endif()
 
 #===============================================================================
 #= Global Include Directories
@@ -153,6 +184,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
+	${CMAKE_THREAD_LIBS_INIT}
 	${QT_LIBRARIES}
 )
 
@@ -177,7 +209,23 @@ target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
 #= Installation
 #-------------------------------------------------------------------------------
 
-install(PROGRAMS ${PROJECT_NAME} DESTINATION bin/)
+install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
+
+#===============================================================================
+#= Packaging (handled by CPack)
+#-------------------------------------------------------------------------------
+
+set(CPACK_PACKAGE_VERSION_MAJOR ${PV_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PV_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PV_VERSION_MICRO})
+set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README)
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING)
+set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME
+	"${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}")
+set(CPACK_SOURCE_GENERATOR "TGZ")
+
+include(CPack)
 
 #===============================================================================
 #= Tests