diff --git a/cmake/OptionVariables.cmake b/cmake/OptionVariables.cmake
index 5587da6..8fd5206 100644
--- a/cmake/OptionVariables.cmake
+++ b/cmake/OptionVariables.cmake
@@ -154,23 +154,11 @@ if(PROJECT_IS_TOP_LEVEL)
   option(CPPTRACE_BUILD_TESTING_SPLIT_DWARF "" OFF)
   set(CPPTRACE_BUILD_TESTING_DWARF_VERSION "0" CACHE STRING "")
   option(CPPTRACE_BUILD_TEST_RDYNAMIC "" OFF)
-  set(CPPTRACE_ZSTD_REPO "https://github.com/facebook/zstd.git" CACHE STRING "")
-  set(CPPTRACE_ZSTD_TAG "63779c798237346c2b245c546c40b72a5a5913fe" CACHE STRING "") # v1.5.5
-  set(CPPTRACE_ZSTD_SHALLOW "1" CACHE STRING "")
-  set(CPPTRACE_LIBDWARF_REPO "https://github.com/jeremy-rifkin/libdwarf-lite.git" CACHE STRING "")
-  set(CPPTRACE_LIBDWARF_TAG "6dbcc23dba6ffd230063bda4b9d7298bf88d9d41" CACHE STRING "") # v0.10.1
-  set(CPPTRACE_LIBDWARF_SHALLOW "1" CACHE STRING "")
   mark_as_advanced(
     CPPTRACE_BUILD_TESTING
     CPPTRACE_BUILD_TESTING_SPLIT_DWARF
     CPPTRACE_BUILD_TESTING_DWARF_VERSION
     CPPTRACE_BUILD_TEST_RDYNAMIC
-    CPPTRACE_ZSTD_REPO
-    CPPTRACE_ZSTD_TAG
-    CPPTRACE_ZSTD_SHALLOW
-    CPPTRACE_LIBDWARF_REPO
-    CPPTRACE_LIBDWARF_TAG
-    CPPTRACE_LIBDWARF_SHALLOW
   )
 endif()
 
@@ -184,6 +172,12 @@ option(CPPTRACE_WERROR_BUILD "" OFF)
 option(CPPTRACE_POSITION_INDEPENDENT_CODE "" ON)
 option(CPPTRACE_SKIP_UNIT "" OFF)
 option(CPPTRACE_USE_EXTERNAL_GTEST "" OFF)
+set(CPPTRACE_ZSTD_REPO "https://github.com/facebook/zstd.git" CACHE STRING "")
+set(CPPTRACE_ZSTD_TAG "63779c798237346c2b245c546c40b72a5a5913fe" CACHE STRING "") # v1.5.5
+set(CPPTRACE_ZSTD_SHALLOW "1" CACHE STRING "")
+set(CPPTRACE_LIBDWARF_REPO "https://github.com/jeremy-rifkin/libdwarf-lite.git" CACHE STRING "")
+set(CPPTRACE_LIBDWARF_TAG "6dbcc23dba6ffd230063bda4b9d7298bf88d9d41" CACHE STRING "") # v0.10.1
+set(CPPTRACE_LIBDWARF_SHALLOW "1" CACHE STRING "")
 
 mark_as_advanced(
   CPPTRACE_BACKTRACE_PATH
@@ -195,4 +189,10 @@ mark_as_advanced(
   CPPTRACE_VCPKG
   CPPTRACE_SKIP_UNIT
   CPPTRACE_USE_EXTERNAL_GTEST
+  CPPTRACE_ZSTD_REPO
+  CPPTRACE_ZSTD_TAG
+  CPPTRACE_ZSTD_SHALLOW
+  CPPTRACE_LIBDWARF_REPO
+  CPPTRACE_LIBDWARF_TAG
+  CPPTRACE_LIBDWARF_SHALLOW
 )