Merge pull request #180 from AlysonStahl-NOAA/as_parallel

fixing parallel build

CMakeLists.txt

@@ -155,6 +155,10 @@ message(STATUS "Adding wgrib2, aux_probs subdirectories...")
 add_subdirectory(wgrib2)
 add_subdirectory(aux_progs)
 
+if(MAKE_FTN_API AND NOT BUILD_LIB)
+  message(FATAL_ERROR "MAKE_FTN_API should only be on when building library")
+endif()
+
 if(BUILD_LIB)
   message(STATUS "Adding wgrib2 library build...")
   ### Package config

spack/package.py

@@ -98,7 +98,7 @@ def url_for_version(self, version):
         "fortran_api",
         default=True,
         description="Make wgrib2api which allows fortran code to read/write grib2",
-        when="@:3.1",
+        when="@3.3:",
     )
     #   Not currently working for @3.2:
     #    variant("lib", default=True, description="Build library", when="@3.2:")

wgrib2/CMakeLists.txt

@@ -47,8 +47,7 @@ wgrib2_api.c wgrib2.c Wind_dir.c Wind_speed.c Wind_uv.c Write_sec.c
 Wrt_grib.c wrtieee.c wxtext.c)
 
 if(MAKE_FTN_API)
-  list(APPEND lib_src
-    ftn_api/fort_wgrib2.c ftn_api/wgrib2api.f90  ftn_api/wgrib2lowapi.f90 )
+  add_subdirectory(ftn_api)
 endif()
 
 add_subdirectory(gctpc)

ftn_api/CMakeLists.txt → wgrib2/ftn_api/CMakeLists.txt

@@ -1,4 +1,8 @@
-
+# This is the CMake file for the ftn_api directory in the wgrib2
+# project. This will only build if MAKE_FTN_API=ON and 
+# BUILD_LIB=ON
+#
+# Kyle Gerheiser
 
 set(fortran_src
   wgrib2api.f90
@@ -9,14 +13,11 @@ set(c_src
   fort_wgrib2.c
   )
 
-
 add_library(wgrib2_api ${fortran_src} ${c_src})
 
 set(module_dir "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}")
 set_target_properties(wgrib2_api PROPERTIES Fortran_MODULE_DIRECTORY ${module_dir})
 
-
-
 target_include_directories(wgrib2_api
     PUBLIC $<BUILD_INTERFACE:${module_dir}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}>)