#2214: Make sure to include configure_options.cmake after gathering i…

…nformation about TPLs
DARMA-tasking · Nov 17, 2023 · 032e528 · 032e528
1 parent 8795ad9
commit 032e528
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,10 +62,13 @@ include(cmake/link_vt.cmake)
 # Load packages that are required for core VT build
 include(cmake/load_packages.cmake)
 
+# Some options use TPL information (whether Perl was found etc.)
+include(cmake/configure_options.cmake)
+
 include(cmake/check_compiler.cmake)
 include(cmake/nvcc_no_deprecated_gpu_targets.cmake)
 include(cmake/load_bundled_libraries.cmake)
-include(cmake/configure_options.cmake)
+
 
 # Primary VT build
 add_subdirectory(src)

diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake
@@ -84,10 +84,6 @@ define_option(vt_mpi_guards "user MPI prevention guards"
     ON vt_feature_cmake_mpi_access_guards
 )
 
-if(vt_zoltan_enabled AND NOT vt_zoltan_found)
-    message(STATUS "vt_zoltan_enabled=ON but Zoltan wasn't found!")
-    set(vt_zoltan_enabled OFF)
-endif()
 define_option(vt_zoltan_enabled "Zoltan" "Build VT with Zoltan" OFF vt_feature_cmake_zoltan)
 
 if(NOT LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "release")

diff --git a/cmake/load_packages.cmake b/cmake/load_packages.cmake
@@ -9,9 +9,6 @@ include(cmake/load_mpi_package.cmake)
 # ZLIB package
 include(cmake/load_zlib_package.cmake)
 
-# Discover and load threading configuration
-# include(cmake/load_threading_package.cmake)
-
 # Perl is used to build the PMPI wrappers
 find_package(Perl)
 

diff --git a/cmake/load_threading_package.cmake b/cmake/load_threading_package.cmake