Merge branch 'pre-release' into get-numpy

slaclab · Dec 5, 2024 · 9908bb0 · 9908bb0
2 parents 0c6c060 + 2b49f24
commit 9908bb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,7 +68,7 @@ if ( NOT NO_PYTHON )
 
    # Hint for boost on anaconda
    if (DEFINED ENV{CONDA_PREFIX})
-      set(Boost_ROOT $ENV{CONDA_PREFIX})
+      set(BOOST_ROOT $ENV{CONDA_PREFIX})
    endif()
 
    # libboost_python3.7 style libraries

diff --git a/templates/RogueConfig.cmake.in b/templates/RogueConfig.cmake.in
@@ -49,7 +49,7 @@ if ( NOT NO_PYTHON )
 
    # Hint for boost on anaconda
    if (DEFINED ENV{CONDA_PREFIX})
-      set(Boost_ROOT $ENV{CONDA_PREFIX})
+      set(BOOST_ROOT $ENV{CONDA_PREFIX})
    endif()
 
    # libboost_python3.7 style libraries