diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8ea676..1afd1fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,8 @@ project(blah2)
 include(CMakePrintHelpers)
 include(CTest)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
+
 find_package(Threads REQUIRED)
 find_package(asio  REQUIRED)
 find_path(RAPIDJSON_INCLUDE_DIRS "rapidjson/allocators.h")
@@ -18,15 +20,15 @@ find_package(Catch2 CONFIG REQUIRED)
 set(CMAKE_PREFIX_PATH "/opt/uhd" ${CMAKE_PREFIX_PATH})
 find_package(UHD "4.6.0.0" CONFIG REQUIRED)
 
-SET (PROJECT_ROOT "${PROJECT_SOURCE_DIR}")
-SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_ROOT}/bin")
-SET (PROJECT_BINARY_TEST_DIR "${PROJECT_ROOT}/bin/test")
-SET (PROJECT_BINARY_TEST_UNIT_DIR "${PROJECT_BINARY_TEST_DIR}/unit")
-SET (PROJECT_BINARY_TEST_FUNCTIONAL_DIR "${PROJECT_BINARY_TEST_DIR}/functional")
-SET (PROJECT_BINARY_TEST_COMPARISON_DIR "${PROJECT_BINARY_TEST_DIR}/comparison")
+set(PROJECT_ROOT "${PROJECT_SOURCE_DIR}")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_ROOT}/bin")
+set(PROJECT_BINARY_TEST_DIR "${PROJECT_ROOT}/bin/test")
+set(PROJECT_BINARY_TEST_UNIT_DIR "${PROJECT_BINARY_TEST_DIR}/unit")
+set(PROJECT_BINARY_TEST_FUNCTIONAL_DIR "${PROJECT_BINARY_TEST_DIR}/functional")
+set(PROJECT_BINARY_TEST_COMPARISON_DIR "${PROJECT_BINARY_TEST_DIR}/comparison")
 
-MESSAGE ("Binary path: ${PROJECT_BINARY_DIR}")
-MESSAGE ("Binary test path: ${PROJECT_BINARY_TEST_DIR}")
+message("Binary path: ${PROJECT_BINARY_DIR}")
+message("Binary test path: ${PROJECT_BINARY_TEST_DIR}")
 
 # include from top-level src dir
 include_directories(src ${UHD_INCLUDE_DIRS})