Skip to content

Commit

Permalink
Merge pull request #740 from tjhei/fix-fortran-off
Browse files Browse the repository at this point in the history
fix disabling fortran
  • Loading branch information
MFraters authored Jun 5, 2024
2 parents 9303ad8 + 96f9d02 commit a68f06e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
if(MAKE_PYTHON_WRAPPER)
set(CMAKE_SWIG_OUTDIR ${PROJECT_BINARY_DIR}/lib)
endif()
if(CMAKE_Fortran_COMPILER)
if(WB_MAKE_FORTRAN_WRAPPER)
set(CMAKE_Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/mod)
endif()

Expand All @@ -231,7 +231,7 @@ include_directories("include/" "tests/" "${CMAKE_CURRENT_BINARY_DIR}/include")
# Add source directory
file(GLOB_RECURSE SOURCES_CXX "source/world_builder/*.cc" "${PROJECT_BINARY_DIR}/source/world_builder/*.cc")

if(CMAKE_Fortran_COMPILER)
if(WB_MAKE_FORTRAN_WRAPPER)
file(GLOB_RECURSE SOURCES_FORTRAN "source/world_builder/*.f90")
endif()

Expand Down Expand Up @@ -561,7 +561,7 @@ install(CODE "message(Installing...)")
install(TARGETS ${WB_TARGET} EXPORT WorldBuilder DESTINATION bin)
install(EXPORT WorldBuilder DESTINATION bin)

if(CMAKE_Fortran_COMPILER)
if(WB_MAKE_FORTRAN_WRAPPER)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mod/worldbuilder.mod DESTINATION include)
endif()

Expand Down

0 comments on commit a68f06e

Please sign in to comment.