buildsystem: Abort cmake config if Boost is not found

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f498110cd3bf46694fe5fffcc0f80860f2f510f0..f983ebda2e12468a953d28b4f985a167b32a6194 100644 (file)
--- 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
@@ -35,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()
 
 #===============================================================================
@@ -49,17 +53,16 @@ pkg_check_modules(PKGDEPS REQUIRED
 
 find_package(Qt4 REQUIRED)
 
-# On Windows/MinGW we explicitly point cmake to the Boost directory.
-if(WIN32)
-       set(BOOST_ROOT /usr/local)
-endif()
+# 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.45 COMPONENTS system thread_win32)
+find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED)
 else()
-find_package(Boost 1.45 COMPONENTS system thread)
+find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
 endif()
 
 #===============================================================================
@@ -97,11 +100,11 @@ set(pulseview_SOURCES
        pv/data/signaldata.cpp
        pv/data/snapshot.cpp
        pv/dialogs/about.cpp
-       pv/dialogs/hwcap.cpp
+       pv/dialogs/deviceoptions.cpp
        pv/prop/enum.cpp
        pv/prop/property.cpp
        pv/prop/binding/binding.cpp
-       pv/prop/binding/hwcap.cpp
+       pv/prop/binding/deviceoptions.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
        pv/view/header.cpp
@@ -175,6 +178,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 
 set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
+       ${CMAKE_THREAD_LIBS_INIT}
        ${QT_LIBRARIES}
 )
 
@@ -205,9 +209,15 @@ 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)