diff --git a/include/dindexer-common/cmake_on_off.h b/include/dindexer-common/cmake_on_off.h
index dba9e75..165ab95 100644
--- a/include/dindexer-common/cmake_on_off.h
+++ b/include/dindexer-common/cmake_on_off.h
@@ -20,9 +20,19 @@
 
 #if !defined(CMAKE_ON)
 #	define CMAKE_ON 1
+#	define CMAKE_on 1
+#	define CMAKE_On 1
+#	define CMAKE_oN 1
 #endif
 #if !defined(CMAKE_OFF)
 #	define CMAKE_OFF 0
+#	define CMAKE_OFf 0
+#	define CMAKE_OfF 0
+#	define CMAKE_Off 0
+#	define CMAKE_oFF 0
+#	define CMAKE_oFf 0
+#	define CMAKE_ofF 0
+#	define CMAKE_off 0
 #endif
 
 #endif
diff --git a/src/machinery/CMakeLists.txt b/src/machinery/CMakeLists.txt
index cda93f0..64c87c6 100644
--- a/src/machinery/CMakeLists.txt
+++ b/src/machinery/CMakeLists.txt
@@ -4,7 +4,6 @@ include(WithMediaAutodetect)
 find_package(Magic REQUIRED)
 
 option(DINDEXER_WITH_NICE_MEDIA_TYPES "Enable this if C++14 is available in order to get some nicer media type names, like CD-Rom instead of CDRom" OFF)
-string(TOUPPER ${DINDEXER_WITH_NICE_MEDIA_TYPES} DINDEXER_WITH_NICE_MEDIA_TYPES)
 
 add_library(${PROJECT_NAME} SHARED
 	pathname.cpp