Fixed timeline scale

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cea8b744f7a2e67e132983da357db9366a715f46..a54708e3f61a8c9079dff7a3bda7e285b03a0cb2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,11 @@ project(pulseview)
 #-------------------------------------------------------------------------------
 
 option(ENABLE_TESTS "Enable unit tests" FALSE)
-option(STATIC_PKGDEPS_LIBS "Statically link to sigrok libraries" FALSE)
+option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
 if(WIN32)
-       # On Windows/MinGW we need to statically link to libraries
-       # This option is user configurable, but enable it by default on 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)
 endif()
 
@@ -49,10 +49,15 @@ pkg_check_modules(PKGDEPS REQUIRED
 # On Windows/MinGW we explicitly point cmake to the Boost directory.
 if(WIN32)
        set(BOOST_ROOT /usr/local)
-endif(WIN32)
+endif()
 
 find_package(Qt4 REQUIRED)
+
+if(ENABLE_TESTS)
 find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
+else()
+find_package(Boost 1.46)
+endif()
 
 #===============================================================================
 #= Config Header
@@ -125,6 +130,7 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
+add_definitions(-Werror -Wall)
 
 #===============================================================================
 #= Global Include Directories