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.

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

Linking Baselibs in GMAO_pFIO and MAPL_Base #49

Closed
wants to merge 1 commit into from
+2 −5
Closed

Linking Baselibs in GMAO_pFIO and MAPL_Base #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions GMAO_pFIO/CMakeLists.txt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,9 @@ set (srcs
)

esma_add_library (${this} SRCS ${srcs})
target_link_libraries (${this} gftl ${NETCDF_LIBRARIES})
target_link_libraries (${this} PUBLIC Baselibs)

target_compile_options (${this} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${OpenMP_Fortran_FLAGS}>)
set_target_properties (${this} PROPERTIES Fortran_MODULE_DIRECTORY ${include_${this}})
target_link_libraries (${this} ${MPI_Fortran_LIBRARIES} ${OpenMP_Fortran_LIBRARIES})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LiamBindle Thanks - I'd always wondered why we were needing to repeat this logic here. I'm too Fortran-centric to have noticed that Fortran is only an option for the FindOpenMP() flag.

Not going to approve this yet, as it is contingent on the other PR.

# Kludge for OSX security and DYLD_LIBRARY_PATH ...
foreach(dir ${OSX_EXTRA_LIBRARY_PATH})
target_link_libraries(${this} "-Xlinker -rpath -Xlinker ${dir}")
Expand Down
1 change: 0 additions & 1 deletion MAPL_Base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ set (srcs
)

esma_add_library(${this} SRCS ${srcs} DEPENDENCIES GMAO_pFIO MAPL_cfio_r4)
target_compile_options (${this} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${OpenMP_Fortran_FLAGS}>)

# Kludge for OSX security and DYLD_LIBRARY_PATH ...
foreach(dir ${OSX_EXTRA_LIBRARY_PATH})
Expand Down
2 changes: 1 addition & 1 deletion MAPL_cfio/CMakeLists.txt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ esma_add_library (${lib}
SRCS ${srcs}
DEPENDENCIES ${ESMF_LIBRARIES}
)
target_include_directories (${lib} PUBLIC ${INC_NETCDF} ${INC_ESMF})
target_link_libraries(${lib} PUBLIC Baselibs)

if (precision MATCHES "r8")
string (REPLACE " " ";" flags ${FREAL8})
Expand Down