Skip to content

Commit

Permalink
Merge pull request #1031 from slaclab/cmake_boost
Browse files Browse the repository at this point in the history
Fix boost variable in both rogue CmakeLists and external library RogueConfig template
  • Loading branch information
slacrherbst authored Dec 5, 2024
2 parents be66f5b + 0eeada2 commit 2b49f24
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/RogueConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2b49f24

Please sign in to comment.