Skip to content

caf invokes compiler specified by OC-build-time FC #197

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
merged 2 commits into from
Jun 4, 2016
Merged

caf invokes compiler specified by OC-build-time FC #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ae3c6
caf invokes compiler specified by OC-build-time FC
Jun 3, 2016
49b54ea
Merge branch 'master' into invoke-user-mpif90-in-caf-script
Jun 4, 2016
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
6 changes: 2 additions & 4 deletions src/extensions/caf-foot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ if [ $# == 0 ]; then
exit 1
fi

# Default to "mpif90" Fortran compiler if environment variable CAFC has zero length:
if [ -z "$CAFC" ]; then
CAFC=mpif90
fi
# Default to "mpif90" Fortran compiler if environment variable CAFC is empty or unset:
CAFC=${CAFC:-mpif90}

# TODO -- improve the syntax of the "set" command below to accepted an unlimited number of arguments
max_arguments=100
Expand Down
5 changes: 5 additions & 0 deletions src/mpi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ if(opencoarrays_aware_compiler)
else()
file(APPEND "${compiler_wrapper}" "caf_compiler=false\n")
endif()

if ( DEFINED ENV{FC} )
file(APPEND "${compiler_wrapper}" "CAFC=$ENV{FC}\n")
endif ()

if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
file(APPEND "${compiler_wrapper}" "linux=true\n")
endif()
Expand Down