Merge pull request #8 from GEOS-ESM/feature/mathomp4/mkl-is-optional

Updates to allow GEOS to build without MKL
GEOS-ESM · Sep 22, 2020 · 1d84126 · 1d84126
2 parents eb7b411 + 8b22490
commit 1d84126
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/NCEP_gfsio/CMakeLists.txt b/NCEP_gfsio/CMakeLists.txt
@@ -2,7 +2,19 @@ esma_set_this ()
 
 esma_add_library (${this}
   SRCS gfsio_module.f90 gfsio_solve_axb.F90
-  DEPENDENCIES GMAO_mpeu NCEP_bacio_r4i4 NCEP_w3_r4i4 ${MKL_LIBRARIES}
+  DEPENDENCIES GMAO_mpeu NCEP_bacio_r4i4 NCEP_w3_r4i4
   )
 
+if (APPLE)
+   set(MKL_Fortran TRUE)
+endif ()
+find_package(MKL)
+if (MKL_FOUND)
+   set(BLA_VENDOR Intel10_64lp_seq)
+   target_link_libraries(${this} PRIVATE ${MKL_LIBRARIES})
+else ()
+   find_package(LAPACK REQUIRED)
+   target_link_libraries(${this} PRIVATE ${LAPACK_LIBRARIES})
+endif ()
+
 set (CMAKE_Fortran_FLAGS_RELEASE "-O3 ${BIG_ENDIAN} ${common_Fortran_flags} ${GEOS_Fortran_Release_FPE_Flags} ${ALIGNCOM}")
diff --git a/NCEP_sp/CMakeLists.txt b/NCEP_sp/CMakeLists.txt
@@ -18,7 +18,17 @@ set (CMAKE_Fortran_FLAGS_RELEASE "-O2 ${GEOS_Fortran_Release_FPE_Flags} ${EXTEND
 
 esma_add_library (${this} SRCS ${srcs} DEPENDENCIES NCEP_w3_${precision})
 
-target_link_libraries(${this} PUBLIC ${MKL_LIBRARIES})
+if (APPLE)
+   set(MKL_Fortran TRUE)
+endif ()
+find_package(MKL)
+if (MKL_FOUND)
+   set(BLA_VENDOR Intel10_64lp_seq)
+   target_link_libraries(${this} PRIVATE ${MKL_LIBRARIES})
+else ()
+   find_package(LAPACK REQUIRED)
+   target_link_libraries(${this} PRIVATE ${LAPACK_LIBRARIES})
+endif ()
 
 if (precision MATCHES "r4i4")
   # use default real/int precisions