From 90de87590c0cdb571fea2c05a5ad9ebfdc414b63 Mon Sep 17 00:00:00 2001
From: Liam Bindle <liambindle@gmail.com>
Date: Sat, 14 Sep 2019 19:47:25 -0300
Subject: [PATCH] Updates to use Baselibs in GMAO_pFIO and MAPL_Base

---
 GMAO_pFIO/CMakeLists.txt | 4 +---
 MAPL_Base/CMakeLists.txt | 1 -
 MAPL_cfio/CMakeLists.txt | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 GMAO_pFIO/CMakeLists.txt
 mode change 100644 => 100755 MAPL_cfio/CMakeLists.txt

diff --git a/GMAO_pFIO/CMakeLists.txt b/GMAO_pFIO/CMakeLists.txt
old mode 100644
new mode 100755
index 30e93924b008..567edbbe1957
--- a/GMAO_pFIO/CMakeLists.txt
+++ b/GMAO_pFIO/CMakeLists.txt
@@ -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})
 # Kludge for OSX security and DYLD_LIBRARY_PATH ...
 foreach(dir ${OSX_EXTRA_LIBRARY_PATH})
   target_link_libraries(${this} "-Xlinker -rpath -Xlinker ${dir}")
diff --git a/MAPL_Base/CMakeLists.txt b/MAPL_Base/CMakeLists.txt
index 47a54d39d08e..a0ed54dd4b01 100644
--- a/MAPL_Base/CMakeLists.txt
+++ b/MAPL_Base/CMakeLists.txt
@@ -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})
diff --git a/MAPL_cfio/CMakeLists.txt b/MAPL_cfio/CMakeLists.txt
old mode 100644
new mode 100755
index 1da15c7b7a77..4551d29e5af8
--- a/MAPL_cfio/CMakeLists.txt
+++ b/MAPL_cfio/CMakeLists.txt
@@ -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})