Set the package version number

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9ae0e76e4de201664c3d640ec59d4b9ce24038c..eeaf5002fa2c35f9cc663d20325a21a2b39891f1 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)
 
@@ -53,7 +54,13 @@ if(WIN32)
        set(BOOST_ROOT /usr/local)
 endif()
 
-find_package(Boost 1.46 COMPONENTS system thread)
+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
@@ -90,6 +97,11 @@ set(pulseview_SOURCES
        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
@@ -133,7 +145,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
@@ -183,7 +199,20 @@ 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")
+
+include(CPack)
 
 #===============================================================================
 #= Tests