X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=e7d0bf5f1f3a1f9ca19eaa7e4ecc61ae66913aed;hp=3482980958f6ffbf557f95526d7b9f1a9fca0361;hb=6b197c700a2065941671c5ef557dc80ba3c978ac;hpb=1c4ec8d0157dfdd9d567e0d183e3813c330e954a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3482980..e7d0bf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,11 @@ if(POLICY CMP0071)
 	cmake_policy(SET CMP0071 NEW)
 endif()
 
+# Only interpret if() arguments as variables or keywords when unquoted.
+if(POLICY CMP0054)
+	cmake_policy(SET CMP0054 NEW)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 
 #===============================================================================
@@ -39,7 +44,7 @@ option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_STACKTRACE "Enable stack trace when crashing" FALSE)
 option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
-option(ENABLE_TESTS "Enable unit tests" TRUE)
+option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 
 if(WIN32)
@@ -265,8 +270,8 @@ set(pulseview_SOURCES
 	pv/views/trace/viewwidget.cpp
 	pv/views/viewbase.cpp
 	pv/views/trace/standardbar.cpp
-	pv/widgets/colourbutton.cpp
-	pv/widgets/colourpopup.cpp
+	pv/widgets/colorbutton.cpp
+	pv/widgets/colorpopup.cpp
 	pv/widgets/devicetoolbutton.cpp
 	pv/widgets/exportmenu.cpp
 	pv/widgets/importmenu.cpp
@@ -324,8 +329,8 @@ set(pulseview_HEADERS
 	pv/views/trace/viewwidget.hpp
 	pv/views/viewbase.hpp
 	pv/views/trace/standardbar.hpp
-	pv/widgets/colourbutton.hpp
-	pv/widgets/colourpopup.hpp
+	pv/widgets/colorbutton.hpp
+	pv/widgets/colorpopup.hpp
 	pv/widgets/devicetoolbutton.hpp
 	pv/widgets/exportmenu.hpp
 	pv/widgets/importmenu.hpp