X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=4448260b6bafc31737ec30505ee308cb78cf148c;hb=bc9edd9d5f7871272f4bbe5fc72bcc04983487e5;hp=ba28408f6593e35b51d1dee3817c661005dbf1d1;hpb=c800a80b42d35c45258c315c3d9013d6c07fa8b3;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba28408..4448260 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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,12 @@ 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()
-
 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)
+else()
+find_package(Boost 1.42 COMPONENTS system thread)
 endif()
 
 #===============================================================================
@@ -199,7 +198,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