From 14eb8cd93469f8d876c2017fc42bab7b3f5f2218 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Mon, 10 Aug 2020 14:50:30 -0600
Subject: [PATCH 1/5] Update submodule pointer for CMakeModules

---
 CMakeModules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeModules b/CMakeModules
index 29e34bc2..654cc5a9 160000
--- a/CMakeModules
+++ b/CMakeModules
@@ -1 +1 @@
-Subproject commit 29e34bc2afc40890dc8532b85013de12432d68c5
+Subproject commit 654cc5a92a661348ac991640fe9cd1577227f26e

From 24996d72ea788116bfc403cec5e4e5512d44b95f Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Mon, 10 Aug 2020 14:50:52 -0600
Subject: [PATCH 2/5] Add gctpc objects to wgrib2 library

---
 wgrib2/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wgrib2/CMakeLists.txt b/wgrib2/CMakeLists.txt
index c37fcec1..4c490412 100644
--- a/wgrib2/CMakeLists.txt
+++ b/wgrib2/CMakeLists.txt
@@ -16,7 +16,8 @@ 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> ${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)
 

From 4c7f68523e40d09add78ba72af441d96bf78f3b9 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Mon, 10 Aug 2020 14:51:29 -0600
Subject: [PATCH 3/5] TEMPORARY: QUESTION ABOUT SOME CODE IN TOP-LEVEL
 CMAKELISTS.TXT

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21baa6c5..1bff176c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,8 @@ option(USE_JASPER "Use Jasper?" on)
 option(USE_AEC "Use AEC?" off)
 
 
+# DH* ??? if the "... must be off" statements are correct, the 
+# test should be for if (USE_PNG) and if(USE_JASPER) *DH
 if(USE_G2CLIB) 
     if(not USE_PNG) 
         message(FATAL_ERROR "If USE_G2CLIB is on, USE_PNG must be off")

From 650dda9c8d3361746ddfda50c68a3fcacd496100 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Mon, 10 Aug 2020 14:54:29 -0600
Subject: [PATCH 4/5] wgrib2/CMakeLists.txt: remove commented-out line

---
 wgrib2/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wgrib2/CMakeLists.txt b/wgrib2/CMakeLists.txt
index 4c490412..170f4a7c 100644
--- a/wgrib2/CMakeLists.txt
+++ b/wgrib2/CMakeLists.txt
@@ -16,7 +16,6 @@ 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)

From ad316234cb7954f5162500c957f73c7536e52de0 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Tue, 11 Aug 2020 07:35:38 -0600
Subject: [PATCH 5/5] Fix logical error in CMakeLists.txt

---
 CMakeLists.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bff176c..2114e0c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,14 +31,12 @@ option(USE_JASPER "Use Jasper?" on)
 option(USE_AEC "Use AEC?" off)
 
 
-# DH* ??? if the "... must be off" statements are correct, the 
-# test should be for if (USE_PNG) and if(USE_JASPER) *DH
 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()