X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=f498110cd3bf46694fe5fffcc0f80860f2f510f0;hb=cd6606c22e9fa9c3b70be856d9ed3843e7793b06;hp=9aaf6f3c5d85937d7bb7e88aca32c90ba856842c;hpb=c8df600577e9c7b1ca90baf6bd01ccc980f89464;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9aaf6f3..f498110 100644
--- 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
@@ -91,6 +98,7 @@ set(pulseview_SOURCES
 	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
@@ -137,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
@@ -187,7 +199,17 @@ 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_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