X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=2659f5f151c4e68626a0f55b25adcf3d40162ef1;hp=8b7089e8d209e2e3fc75192b26de885dee3a08d1;hb=1d2fb87d9e2ba045c11456e92ee673ac7e7af594;hpb=5f6061590f1d372d1c79ed78d2000532584e97ac

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b7089e8..2659f5f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,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
@@ -193,7 +199,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