Skip to content

Fixes #111 and other mixed clang/gfortran issues #180

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

Open
platipodium wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fixes #111 and other mixed clang/gfortran issues #180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b8f0b7b
Fixes #111 and other mixed clang/gfortran issues
platipodium May 20, 2025
af64765
Merge branch 'master' into fix-clang-gfortran
platipodium Jun 16, 2025
07074e2
Merge branch 'master' into fix-clang-gfortran
platipodium Jul 29, 2025
00b7d91
Unconditionally remove preprocess options for clang/gnu
platipodium Jul 29, 2025
f56d4c6
Added homebrew gfortran-clang cmake config
platipodium Jul 29, 2025
359c815
Resolved conflict for FABM mask
platipodium Oct 6, 2025
ef0c7b9
Merge branch 'master' into fix-clang-gfortran
platipodium Oct 6, 2025
072fa41
Merge branch 'master' of github.com:schism-dev/schism
platipodium Oct 16, 2025
147dee2
Merge branch 'master' into fix-clang-gfortran
platipodium Oct 16, 2025
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
14 changes: 0 additions & 14 deletions cmake/SCHISM.local.conda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,7 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileContributor Carsten Lemmen <carsten.lemmen@hereon.de

message(WARNING "If you get an error 'Error copying Fortran module' with uppercase/lowercase mismatch, then try setting the CMAKE_C_PREPROCESS_FLAG to an empty string in cmake/SCHISMCompile.cmake")

set(CMAKE_Fortran_COMPILER $ENV{CONDA_PREFIX}/bin/mpifort CACHE PATH "Path to parallel Fortran compiler")
set(CMAKE_C_COMPILER $ENV{CONDA_PREFIX}/bin/mpicc CACHE PATH "Path to parallel C compiler")
set(CMAKE_CXX_COMPILER $ENV{CONDA_PREFIX}/bin/mpicxx CACHE PATH "Path to parallel C++ compiler")
set(PARMETIS_ROOT $ENV{CONDA_PREFIX} CACHE PATH "Root path for external (par)metis")

set_source_files_properties(
*.F90
PROPERTIES Fortran_PREPROCESS ON
)

# Fix gfortran/clang for conda environments
if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
set( C_PREPROCESS_FLAG "" CACHE STRING "C Preprocessor Flag")
endif()
endif()
13 changes: 9 additions & 4 deletions cmake/SCHISMCompile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
set( CMAKE_Fortran_FLAGS_DEBUG_INIT "-g ${SCHISM_GFORTRAN_OPTIONS}")
set( CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g ${SCHISM_GFORTRAN_OPTIONS}")
unset( C_PREPROCESS_FLAG CACHE)
if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
set( C_PREPROCESS_FLAG "--preprocess" CACHE STRING "C Preprocessor Flag")
elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
set( C_PREPROCESS_FLAG "--preprocess" CACHE STRING "C Preprocessor Flag")
if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
Comment thread
PhilMiller marked this conversation as resolved.
Outdated
# gfortran cannot handle Clang's --preprocess flag, thus we need to
# remove it (Clang preprocesses by default, even without the flag)
# and enable Fortran preprocessing for .f90 and F90 files.
set( C_PREPROCESS_FLAG "" CACHE STRING "C Preprocessor Flag")
set_source_files_properties(
*.F90 *.f90
PROPERTIES Fortran_PREPROCESS ON
)
else()
set( C_PREPROCESS_FLAG "-cpp" CACHE STRING "C Preprocessor Flag")
endif()
Expand Down