diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef760087b..8e746c292 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,8 @@ option(KokkosTools_ENABLE_PAPI    "Enable PAPI support"             OFF)
 option(KokkosTools_ENABLE_MPI     "Enable MPI support"              OFF)
 option(KokkosTools_ENABLE_CALIPER "Enable building Caliper library" OFF)
 option(KokkosTools_ENABLE_APEX    "Enable building Apex library"    OFF)
+option(KokkosTools_ENABLE_VARIORUM "Enable Variorum support"        OFF)
+option(KokkosTools_ENABLE_SYSTEMTAP "Enable SystemTap support"      OFF)
 option(KokkosTools_ENABLE_EXAMPLES "Build examples"                 OFF)
 option(KokkosTools_ENABLE_TESTS    "Build tests"                    OFF)
 
@@ -85,7 +87,9 @@ else()
   set(KOKKOSTOOLS_HAS_MPI 0)
 endif()
 
-include(cmake/configure_variorum.cmake)
+if(KokkosTools_ENABLE_VARIORUM)
+  include(cmake/configure_variorum.cmake)
+endif()
 
 set(KOKKOSTOOLS_HAS_CALIPER ${KokkosTools_ENABLE_CALIPER})
 set(KOKKOSTOOLS_HAS_NVTX  ${Kokkos_ENABLE_CUDA}) # we assume that enabling CUDA for Kokkos program means nvtx should be available
@@ -157,14 +161,13 @@ if(KokkosTools_ENABLE_PAPI)
   add_subdirectory(profiling/papi-connector)
 endif()
 
-if(NOT WIN32 AND NOT APPLE)
-  find_program(KOKKOSTOOLS_DTRACE_EXECUTABLE dtrace)
-  if(KOKKOSTOOLS_DTRACE_EXECUTABLE)
+if(KokkosTools_ENABLE_SYSTEMTAP)
+  if(NOT WIN32 AND NOT APPLE)
+    find_program(KOKKOSTOOLS_DTRACE_EXECUTABLE dtrace REQUIRED)
     add_subdirectory(profiling/systemtap-connector)
     set(KOKKOSTOOLS_HAS_SYSTEMTAP ON)
   else()
-    message(STATUS "Skipping systemtap-connector (dtrace executable wasn't found)")
-    set(KOKKOSTOOLS_HAS_SYSTEMTAP OFF)
+    message(FATAL_ERROR "KokkosTools_ENABLE_SYSTEMTAP=ON is not supported on Windows and macOS platforms")
   endif()
 else()
   set(KOKKOSTOOLS_HAS_SYSTEMTAP OFF)
diff --git a/cmake/configure_variorum.cmake b/cmake/configure_variorum.cmake
index 4c45612e8..8fcfb2e07 100644
--- a/cmake/configure_variorum.cmake
+++ b/cmake/configure_variorum.cmake
@@ -21,5 +21,5 @@ find_package(Variorum QUIET)
 if(Variorum_FOUND)
   set(KOKKOSTOOLS_HAS_VARIORUM TRUE)
 else()
-  message(WARNING "Variorum not found: ${MSG_NOTFOUND}")
+  message(FATAL_ERROR "Variorum not found: ${MSG_NOTFOUND}")
 endif()