diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcb00ba..486cc41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,16 +101,16 @@ if (BUILD_SHARED_LIBS)
     PRIVATE
       ${PUGIXML_BUILD_DEFINES}
       $<$<CXX_COMPILER_ID:MSVC>:PUGIXML_API=__declspec\(dllexport\)>
-      $<$<BOOL:HAVE_LONG_LONG>:PUGIXML_HAS_LONG_LONG>
-      $<$<BOOL:PUGIXML_WCHAR_MODE>:PUGIXML_WCHAR_MODE>
-      $<$<BOOL:PUGIXML_COMPACT>:PUGIXML_COMPACT>
-      $<$<BOOL:PUGIXML_NO_XPATH>:PUGIXML_NO_XPATH>
-      $<$<BOOL:PUGIXML_NO_STL>:PUGIXML_NO_STL>
-      $<$<BOOL:PUGIXML_NO_EXCEPTIONS>:PUGIXML_NO_EXCEPTIONS>
-      $<$<BOOL:PUGIXML_MEMORY_PAGE_SIZE>:PUGIXML_MEMORY_PAGE_SIZE=${PUGIXML_MEMORY_PAGE_SIZE}>
-      $<$<BOOL:PUGIXML_MEMORY_OUTPUT_STACK>:PUGIXML_MEMORY_OUTPUT_STACK=${PUGIXML_MEMORY_OUTPUT_STACK}>
-      $<$<BOOL:PUGIXML_MEMORY_XPATH_PAGE_SIZE>:PUGIXML_MEMORY_XPATH_PAGE_SIZE=${PUGIXML_MEMORY_XPATH_PAGE_SIZE}>
-      $<$<BOOL:PUGIXML_XPATH_DEPTH_LIMIT>:PUGIXML_XPATH_DEPTH_LIMIT=${PUGIXML_XPATH_DEPTH_LIMIT}>)
+      $<$<BOOL:${HAVE_LONG_LONG}>:PUGIXML_HAS_LONG_LONG>
+      $<$<BOOL:${PUGIXML_WCHAR_MODE}>:PUGIXML_WCHAR_MODE>
+      $<$<BOOL:${PUGIXML_COMPACT}>:PUGIXML_COMPACT>
+      $<$<BOOL:${PUGIXML_NO_XPATH}>:PUGIXML_NO_XPATH>
+      $<$<BOOL:${PUGIXML_NO_STL}>:PUGIXML_NO_STL>
+      $<$<BOOL:${PUGIXML_NO_EXCEPTIONS}>:PUGIXML_NO_EXCEPTIONS>
+      $<$<BOOL:${PUGIXML_MEMORY_PAGE_SIZE}>:PUGIXML_MEMORY_PAGE_SIZE=${PUGIXML_MEMORY_PAGE_SIZE}>
+      $<$<BOOL:${PUGIXML_MEMORY_OUTPUT_STACK}>:PUGIXML_MEMORY_OUTPUT_STACK=${PUGIXML_MEMORY_OUTPUT_STACK}>
+      $<$<BOOL:${PUGIXML_MEMORY_XPATH_PAGE_SIZE}>:PUGIXML_MEMORY_XPATH_PAGE_SIZE=${PUGIXML_MEMORY_XPATH_PAGE_SIZE}>
+      $<$<BOOL:${PUGIXML_XPATH_DEPTH_LIMIT}>:PUGIXML_XPATH_DEPTH_LIMIT=${PUGIXML_XPATH_DEPTH_LIMIT}>)
   target_compile_options(pugixml-shared
     PRIVATE
       ${msvc-rt-mtd-shared}
@@ -132,16 +132,16 @@ if (NOT BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS)
   target_compile_definitions(pugixml-static
     PRIVATE
       ${PUGIXML_BUILD_DEFINES}
-      $<$<BOOL:HAVE_LONG_LONG>:PUGIXML_HAS_LONG_LONG>
-      $<$<BOOL:PUGIXML_WCHAR_MODE>:PUGIXML_WCHAR_MODE>
-      $<$<BOOL:PUGIXML_COMPACT>:PUGIXML_COMPACT>
-      $<$<BOOL:PUGIXML_NO_XPATH>:PUGIXML_NO_XPATH>
-      $<$<BOOL:PUGIXML_NO_STL>:PUGIXML_NO_STL>
-      $<$<BOOL:PUGIXML_NO_EXCEPTIONS>:PUGIXML_NO_EXCEPTIONS>
-      $<$<BOOL:PUGIXML_MEMORY_PAGE_SIZE>:PUGIXML_MEMORY_PAGE_SIZE=${PUGIXML_MEMORY_PAGE_SIZE}>
-      $<$<BOOL:PUGIXML_MEMORY_OUTPUT_STACK>:PUGIXML_MEMORY_OUTPUT_STACK=${PUGIXML_MEMORY_OUTPUT_STACK}>
-      $<$<BOOL:PUGIXML_MEMORY_XPATH_PAGE_SIZE>:PUGIXML_MEMORY_XPATH_PAGE_SIZE=${PUGIXML_MEMORY_XPATH_PAGE_SIZE}>
-      $<$<BOOL:PUGIXML_XPATH_DEPTH_LIMIT>:PUGIXML_XPATH_DEPTH_LIMIT=${PUGIXML_XPATH_DEPTH_LIMIT}>)
+      $<$<BOOL:${HAVE_LONG_LONG}>:PUGIXML_HAS_LONG_LONG>
+      $<$<BOOL:${PUGIXML_WCHAR_MODE}>:PUGIXML_WCHAR_MODE>
+      $<$<BOOL:${PUGIXML_COMPACT}>:PUGIXML_COMPACT>
+      $<$<BOOL:${PUGIXML_NO_XPATH}>:PUGIXML_NO_XPATH>
+      $<$<BOOL:${PUGIXML_NO_STL}>:PUGIXML_NO_STL>
+      $<$<BOOL:${PUGIXML_NO_EXCEPTIONS}>:PUGIXML_NO_EXCEPTIONS>
+      $<$<BOOL:${PUGIXML_MEMORY_PAGE_SIZE}>:PUGIXML_MEMORY_PAGE_SIZE=${PUGIXML_MEMORY_PAGE_SIZE}>
+      $<$<BOOL:${PUGIXML_MEMORY_OUTPUT_STACK}>:PUGIXML_MEMORY_OUTPUT_STACK=${PUGIXML_MEMORY_OUTPUT_STACK}>
+      $<$<BOOL:${PUGIXML_MEMORY_XPATH_PAGE_SIZE}>:PUGIXML_MEMORY_XPATH_PAGE_SIZE=${PUGIXML_MEMORY_XPATH_PAGE_SIZE}>
+      $<$<BOOL:${PUGIXML_XPATH_DEPTH_LIMIT}>:PUGIXML_XPATH_DEPTH_LIMIT=${PUGIXML_XPATH_DEPTH_LIMIT}>)
   target_compile_options(pugixml-static
     PRIVATE
       ${msvc-rt-mtd-shared}