Add missing settings for boost-thread on MinGW.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1513d6dd1f14da578c66561859142628b6ed85ce..f9c53f4062b0bbd3e719d8ed5665adb7872d90f9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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,20 @@ 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()
 
-find_package(Qt4 REQUIRED)
-
-find_package(Boost 1.46)
+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.45 COMPONENTS system thread_win32)
+else()
+find_package(Boost 1.45 COMPONENTS system thread)
+endif()
 
 #===============================================================================
 #= Config Header
@@ -80,29 +91,37 @@ configure_file (
 
 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
@@ -112,7 +131,7 @@ set(pulseview_HEADERS
 )
 
 set(pulseview_FORMS
-       pv/about.ui
+       pv/dialogs/about.ui
 )
 
 set(pulseview_RESOURCES
@@ -130,7 +149,11 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
-add_definitions(-Werror -Wall)
+add_definitions(-Wextra)
+
+if(NOT DISABLE_WERROR)
+       add_definitions(-Werror)
+endif()
 
 #===============================================================================
 #= Global Include Directories
@@ -180,7 +203,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