diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed43f63c..738aa134 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,39 +53,39 @@ endif()
       -DPROJECT_BUILD_DIR=${PROJECT_BUILD_DIR}
       -DPROJECT_BUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
       -DPROJECT_CMAKE_BUILD_TYPE=${PROJECT_CMAKE_BUILD_TYPE}
-      -DPROJECT_ENABLE_BOOST=${PROJECT_ENABLE_BOOST}
-      -DPROJECT_ENABLE_CLI11=${PROJECT_ENABLE_CLI11}
-      -DPROJECT_ENABLE_CPP_HTTPLIB=${PROJECT_ENABLE_CPP_HTTPLIB}
-      -DPROJECT_ENABLE_CURL=${PROJECT_ENABLE_CURL}
-      -DPROJECT_ENABLE_DTL=${PROJECT_ENABLE_DTL}
-      -DPROJECT_ENABLE_FLAC=${PROJECT_ENABLE_FLAC}
-      -DPROJECT_ENABLE_FMT=${PROJECT_ENABLE_FMT}
-      -DPROJECT_ENABLE_FONTCONFIG=${PROJECT_ENABLE_FONTCONFIG}
-      -DPROJECT_ENABLE_FREETYPE2=${PROJECT_ENABLE_FREETYPE2}
-      -DPROJECT_ENABLE_FUSE=${PROJECT_ENABLE_FUSE}
-      -DPROJECT_ENABLE_FZF=${PROJECT_ENABLE_FZF}
-      -DPROJECT_ENABLE_GTKMM=${PROJECT_ENABLE_GTKMM}
-      -DPROJECT_ENABLE_JSON=${PROJECT_ENABLE_JSON}
-      -DPROJECT_ENABLE_LIBBITCOIN_SYSTEM=${PROJECT_ENABLE_LIBBITCOIN_SYSTEM}
-      -DPROJECT_ENABLE_LIBEVENT=${PROJECT_ENABLE_LIBEVENT}
-      -DPROJECT_ENABLE_LIBSODIUM=${PROJECT_ENABLE_LIBSODIUM}
-      -DPROJECT_ENABLE_NUSPELL=${PROJECT_ENABLE_NUSPELL}
-      -DPROJECT_ENABLE_OGG=${PROJECT_ENABLE_OGG}
-      -DPROJECT_ENABLE_OPENAL=${PROJECT_ENABLE_OPENAL}
-      -DPROJECT_ENABLE_OPENSSL=${PROJECT_ENABLE_OPENSSL}
-      -DPROJECT_ENABLE_PUGIXML=${PROJECT_ENABLE_PUGIXML}
-      -DPROJECT_ENABLE_ROCKSDB=${PROJECT_ENABLE_ROCKSDB}
-      -DPROJECT_ENABLE_SAGO_PLATFORM_FOLDERS=${PROJECT_ENABLE_SAGO_PLATFORM_FOLDERS}
-      -DPROJECT_ENABLE_SECP256K1=${PROJECT_ENABLE_SECP256K1}
-      -DPROJECT_ENABLE_SFML=${PROJECT_ENABLE_SFML}
-      -DPROJECT_ENABLE_SPDLOG=${PROJECT_ENABLE_SPDLOG}
-      -DPROJECT_ENABLE_SQLITE=${PROJECT_ENABLE_SQLITE}
-      -DPROJECT_ENABLE_STDUUID=${PROJECT_ENABLE_STDUUID}
-      -DPROJECT_ENABLE_TESTING=${PROJECT_ENABLE_TESTING}
-      -DPROJECT_ENABLE_TPL=${PROJECT_ENABLE_TPL}
-      -DPROJECT_ENABLE_VORBIS=${PROJECT_ENABLE_VORBIS}
-      -DPROJECT_ENABLE_WINFSP=${PROJECT_ENABLE_WINFSP}
       -DPROJECT_ENABLE_WXWIDGETS=${PROJECT_ENABLE_WXWIDGETS}
+      -DPROJECT_ENABLE_WINFSP=${PROJECT_ENABLE_WINFSP}
+      -DPROJECT_ENABLE_VORBIS=${PROJECT_ENABLE_VORBIS}
+      -DPROJECT_ENABLE_TPL=${PROJECT_ENABLE_TPL}
+      -DPROJECT_ENABLE_TESTING=${PROJECT_ENABLE_TESTING}
+      -DPROJECT_ENABLE_STDUUID=${PROJECT_ENABLE_STDUUID}
+      -DPROJECT_ENABLE_SQLITE=${PROJECT_ENABLE_SQLITE}
+      -DPROJECT_ENABLE_SPDLOG=${PROJECT_ENABLE_SPDLOG}
+      -DPROJECT_ENABLE_SFML=${PROJECT_ENABLE_SFML}
+      -DPROJECT_ENABLE_SECP256K1=${PROJECT_ENABLE_SECP256K1}
+      -DPROJECT_ENABLE_SAGO_PLATFORM_FOLDERS=${PROJECT_ENABLE_SAGO_PLATFORM_FOLDERS}
+      -DPROJECT_ENABLE_ROCKSDB=${PROJECT_ENABLE_ROCKSDB}
+      -DPROJECT_ENABLE_PUGIXML=${PROJECT_ENABLE_PUGIXML}
+      -DPROJECT_ENABLE_OPENSSL=${PROJECT_ENABLE_OPENSSL}
+      -DPROJECT_ENABLE_OPENAL=${PROJECT_ENABLE_OPENAL}
+      -DPROJECT_ENABLE_OGG=${PROJECT_ENABLE_OGG}
+      -DPROJECT_ENABLE_NUSPELL=${PROJECT_ENABLE_NUSPELL}
+      -DPROJECT_ENABLE_LIBSODIUM=${PROJECT_ENABLE_LIBSODIUM}
+      -DPROJECT_ENABLE_LIBEVENT=${PROJECT_ENABLE_LIBEVENT}
+      -DPROJECT_ENABLE_LIBBITCOIN_SYSTEM=${PROJECT_ENABLE_LIBBITCOIN_SYSTEM}
+      -DPROJECT_ENABLE_JSON=${PROJECT_ENABLE_JSON}
+      -DPROJECT_ENABLE_GTKMM=${PROJECT_ENABLE_GTKMM}
+      -DPROJECT_ENABLE_FZF=${PROJECT_ENABLE_FZF}
+      -DPROJECT_ENABLE_FUSE=${PROJECT_ENABLE_FUSE}
+      -DPROJECT_ENABLE_FREETYPE2=${PROJECT_ENABLE_FREETYPE2}
+      -DPROJECT_ENABLE_FONTCONFIG=${PROJECT_ENABLE_FONTCONFIG}
+      -DPROJECT_ENABLE_FMT=${PROJECT_ENABLE_FMT}
+      -DPROJECT_ENABLE_FLAC=${PROJECT_ENABLE_FLAC}
+      -DPROJECT_ENABLE_DTL=${PROJECT_ENABLE_DTL}
+      -DPROJECT_ENABLE_CURL=${PROJECT_ENABLE_CURL}
+      -DPROJECT_ENABLE_CPP_HTTPLIB=${PROJECT_ENABLE_CPP_HTTPLIB}
+      -DPROJECT_ENABLE_CLI11=${PROJECT_ENABLE_CLI11}
+      -DPROJECT_ENABLE_BOOST=${PROJECT_ENABLE_BOOST}
       -DPROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_EXTERNAL_BUILD_ROOT}
       -DPROJECT_FUSE=${PROJECT_FUSE}
       -DPROJECT_FUSE_INCLUDE_DIRS=${PROJECT_FUSE_INCLUDE_DIRS}
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index 2ed8e9ff..d5e12a6f 100755
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -17,4 +17,11 @@ for PROJECT_LIBRARY in "${PROJECT_LIBRARIES[@]}"; do
       rm -r support/3rd_party/${CLEANUP_ITEM}
     done
   fi
+
+  if [ ${!ENABLE_NAME} == "ON" ] && [ "${PROJECT_CLEANUP[${PROJECT_LIBRARY}_ON]}" != "" ]; then
+    CLEANUP_LIST=(${PROJECT_CLEANUP[${PROJECT_LIBRARY}_ON]//:/ })
+    for CLEANUP_ITEM in "${CLEANUP_LIST[@]}"; do
+      rm -r support/3rd_party/${CLEANUP_ITEM}
+    done
+  fi
 done