From 2292deea3242dadc50f461f214d61abaf6e1e714 Mon Sep 17 00:00:00 2001 From: Christopher Mauney Date: Wed, 23 Aug 2023 14:12:52 -0600 Subject: [PATCH] Change cmake module append to use PROJECT_ insteand of CMAKE_ --- CHANGELOG.md | 1 + CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba1c4ac246..afc2fd7bad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [[PR269]](https://github.com/lanl/singularity-eos/pull/269) Add SAP Polynomial EoS ### Fixed (Repair bugs, etc) +- [[PRNNN]](https://github.com/lanl/singularity-eos/pull/NNN) changed `CMAKE_SOURCE_DIR` to `PROJECT_SOURCE_DIR` to fix downstream submodule build - [[PR291]](https://github.com/lanl/singularity-eos/pull/291) package.py updates to reflect new CMake options - [[PR290]](https://github.com/lanl/singularity-eos/pull/290) Added target guards on export config - [[PR288]](https://github.com/lanl/singularity-eos/pull/288) Don't build tests that depend on spiner when spiner is disabled diff --git a/CMakeLists.txt b/CMakeLists.txt index ed46c9314d..3a657c25a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ project( VERSION 1.7.0 LANGUAGES NONE) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") set(SINGULARITY_GOLDFILES_VERSION "goldfiles-1.6.2") set(SINGULARITY_GOLDFILE_HASH @@ -48,7 +48,7 @@ option(SINGULARITY_USE_FORTRAN "Enable fortran bindings" ON) option(SINGULARITY_USE_KOKKOS "Use Kokkos for portability" OFF) option(SINGULARITY_USE_EOSPAC "Enable eospac backend" OFF) -#TODO This should be dependent option (or fortran option) +# TODO This should be dependent option (or fortran option) option(SINGULARITY_BUILD_CLOSURE "Mixed Cell Closure" ON) cmake_dependent_option(SINGULARITY_USE_CUDA "Use CUDA backend of Kokkos" OFF