diff --git a/CMakeLists.txt b/CMakeLists.txt
index 160048c..5258d95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,7 @@ if(MY_BUILD_SHARED_LIBS)
 endif()
 
 set(GLOBAL_ENABLED_MODULES "" CACHE INTERNAL "List of enabled module targets")
-set(GLOBAL_ENABLED_MACROS "" CACHE INTERNAL "List of enabled macros for main")
-set(GLOBAL_ENABLED_MACROS ${GLOBAL_ENABLED_MACROS} PARENT_SCOPE)
+set(GLOBAL_ENABLED_MACROS "" CACHE INTERNAL "List of enabled macros for main" FORCE)
 
 function(add_module MOD_NAME MOD_PATH DEFAULT_STATE HAS_TEST)
     if(NOT DEFAULT_STATE STREQUAL "ON" AND NOT DEFAULT_STATE STREQUAL "OFF")
@@ -60,10 +59,9 @@ function(add_module MOD_NAME MOD_PATH DEFAULT_STATE HAS_TEST)
     if(${BUILD_${MOD_UPPER}})
         set(BUILD_${MOD_UPPER}_HAS_TEST ${HAS_TEST} CACHE INTERNAL "Has test support")
         list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME})
-        list(APPEND GLOBAL_ENABLED_MACROS BUILD_${MOD_UPPER})
+        set(GLOBAL_ENABLED_MACROS "${GLOBAL_ENABLED_MACROS};BUILD_${MOD_UPPER}" CACHE INTERNAL "List of enabled macros for main" FORCE)
         message(STATUS "[Root] Enabled module(TestSupport: ${HAS_TEST}): ${MOD_NAME} (Default: ${DEFAULT_STATE}) -> Macro: BUILD_${MOD_UPPER}")
         set(GLOBAL_ENABLED_MODULES ${GLOBAL_ENABLED_MODULES} PARENT_SCOPE)
-        set(GLOBAL_ENABLED_MACROS ${GLOBAL_ENABLED_MACROS} PARENT_SCOPE)
         add_subdirectory(${MOD_PATH})
     endif()
 endfunction()
@@ -103,14 +101,13 @@ function(add_prebuilt_module MOD_NAME MOD_PATH DEFAULT_STATE HAS_TEST)
     )
 
     list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME})
-    list(APPEND GLOBAL_ENABLED_MACROS BUILD_${MOD_UPPER})
+    set(GLOBAL_ENABLED_MACROS "${GLOBAL_ENABLED_MACROS};BUILD_${MOD_UPPER}" CACHE INTERNAL "List of enabled macros for main" FORCE)
 
     message(STATUS "[Root] Prebuilt module: ${MOD_NAME} from ${LIB_PATH}")
     message(STATUS "[Root] Include dir: ${ABS_INCLUDE_DIR}")
     message(STATUS "[Root] Macro: BUILD_${MOD_UPPER}")
 
     set(GLOBAL_ENABLED_MODULES ${GLOBAL_ENABLED_MODULES} PARENT_SCOPE)
-    set(GLOBAL_ENABLED_MACROS ${GLOBAL_ENABLED_MACROS} PARENT_SCOPE)
 endfunction()
 
 add_module(log library/log OFF OFF)