Skip to content
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.

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

Fix CMake circular dependencies for external use #273

Merged
merged 9 commits into from
Aug 12, 2024
Prev Previous commit
Next Next commit
Do not add MAPL twice
mathomp4 committed Jul 29, 2024
commit a9e739dcde2624d4fcd77aebc3a490b72a5f8508
10 changes: 6 additions & 4 deletions ESMF/Shared/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -12,10 +12,12 @@ if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/@GSW )
set (gsw_ECBUILD_SYSTEM_INCLUDED TRUE)
endif()

if ( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/MAPL@ )
esma_add_subdirectories (
MAPL
)
if (NOT TARGET MAPL)
if ( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/MAPL@ )
esma_add_subdirectories (
MAPL
)
endif ()
endif ()

if ( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/GMAO_Shared@ )