Skip to content

Make -Dwith-mpi respect provided path and ensure "default off" options are turned on only by explicit ON #3148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terhorstd merged 5 commits into from
Mar 25, 2024
Merged

Make -Dwith-mpi respect provided path and ensure "default off" options are turned on only by explicit ON #3148

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d565f5
Fix processing of CMake option `with-mpi`
gtrensch Feb 23, 2024
3e722d7
Update cmake/ProcessOptions.cmake
terhorstd Mar 4, 2024
8867903
Merge branch 'master' into fix-issue2993-with-mpi-option
gtrensch Mar 11, 2024
4d59e33
unifying CMake options handling
gtrensch Mar 12, 2024
c280bdc
Correct according to CMake requirements.
heplesser Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions cmake/ProcessOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,11 @@ endfunction()
function( NEST_PROCESS_WITH_MPI )
# Find MPI
set( HAVE_MPI OFF PARENT_SCOPE )
if ( with-mpi )
if ( NOT "${with-mpi}" STREQUAL "OFF" )
if ( NOT ${with-mpi} STREQUAL "ON" )
# if set, use this prefix
set( MPI_ROOT "${with-mpi}" )
endif ()
find_package( MPI REQUIRED )
if ( MPI_CXX_FOUND )
set( HAVE_MPI ON PARENT_SCOPE )
Expand Down Expand Up @@ -686,7 +690,7 @@ function( NEST_PROCESS_WITH_MPI4PY )
endfunction ()

function( NEST_PROCESS_USERDOC )
if ( with-userdoc )
if ( ${with-userdoc} STREQUAL "ON")
message( STATUS "Configuring user documentation" )
find_package( Sphinx REQUIRED)
find_package( Pandoc REQUIRED)
Expand All @@ -697,7 +701,7 @@ function( NEST_PROCESS_USERDOC )
endfunction ()

function( NEST_PROCESS_DEVDOC )
if ( with-devdoc )
if ( ${with-devdoc} STREQUAL "ON" )
message( STATUS "Configuring developer documentation" )
find_package( Doxygen REQUIRED dot )
set( BUILD_DOXYGEN_DOCS ON PARENT_SCOPE )
Expand All @@ -706,7 +710,7 @@ function( NEST_PROCESS_DEVDOC )
endfunction ()

function( NEST_PROCESS_FULL_LOGGING )
if ( with-full-logging )
if ( ${with-full-logging} STREQUAL "ON" )
message( STATUS "Configuring full logging" )
set( ENABLE_FULL_LOGGING ON PARENT_SCOPE )
endif ()
Expand Down