Add missing newlines in two header files.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e1716b7f512cacbf6ddd3a2199d80fef3ca5d72..d3ee6212c7a524d5bc5c7d8413d22f4039a11ad1 100644 (file)
--- 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()
 
+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)
+else()
 find_package(Boost 1.46 COMPONENTS system thread)
+endif()
 
 #===============================================================================
 #= Config Header
@@ -138,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