Merge pull request #12 from climbfuji/wgrib2_cmake_build_updates_dom_…

…20200810 NCEPLIBS-wgrib2 cmake build updates
NOAA-EMC · Aug 11, 2020 · c7b9aa0 · c7b9aa0
2 parents fd981bc + ad31623
commit c7b9aa0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,11 +32,11 @@ option(USE_AEC "Use AEC?" off)
 
 
 if(USE_G2CLIB) 
-    if(not USE_PNG) 
+    if(USE_PNG) 
         message(FATAL_ERROR "If USE_G2CLIB is on, USE_PNG must be off")
     endif()
 
-    if(not USE_JASPER) 
+    if(USE_JASPER) 
         message(FATAL_ERROR "If USE_G2CLIB is on, USE_JASPER must be off")
     endif()
 endif()

diff --git a/CMakeModules b/CMakeModules
diff --git a/wgrib2/CMakeLists.txt b/wgrib2/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(obj_lib OBJECT ${lib_src})
 target_compile_definitions(obj_lib PUBLIC ${definitions_list}) 
 
 # with -DCALLABLE_WGRIB2 for the lib
-add_library(wgrib2_lib $<TARGET_OBJECTS:obj_lib> ${callable_src})
+add_library(wgrib2_lib $<TARGET_OBJECTS:obj_lib> $<TARGET_OBJECTS:gctpc> ${callable_src})
 # library and executable have same name (wgrib2) but different target names
 set_target_properties(wgrib2_lib PROPERTIES OUTPUT_NAME wgrib2)