## 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
# 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()
#===============================================================================
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.46 COMPONENTS system thread_win32)
-elseif()
-find_package(Boost 1.46 COMPONENTS system thread)
+find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED)
+else()
+find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
endif()
#===============================================================================
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
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
-add_definitions(-Wextra)
+add_definitions(-Wall -Wextra)
if(NOT DISABLE_WERROR)
add_definitions(-Werror)
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
${QT_LIBRARIES}
)
#= 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