diff --git a/kcms/keyboard/CMakeLists.txt b/kcms/keyboard/CMakeLists.txt
--- a/kcms/keyboard/CMakeLists.txt
+++ b/kcms/keyboard/CMakeLists.txt
@@ -83,8 +83,7 @@
 
 find_package(Boost)
 
-if(Boost_FOUND)
-  set(NEW_GEOMETRY ON)
+if(Boost_FOUND AND NEW_GEOMETRY)
 
   set(preview_SRCS
     preview/geometry_components.cpp
@@ -106,7 +105,7 @@
    endif()
 else(Boost_FOUND)
 
-  message("Boost not found, install Boost libraries to enable keyboard geometry preview")
+  message("Boost not found or new geometry parser disabled, install Boost libraries or pass -DNEW_GEOMETRY=ON to enable keyboard geometry preview")
 
 endif(Boost_FOUND)