diff --git a/CMakeLists.txt b/CMakeLists.txt index 21baa6c5..2114e0c4 100644 --- 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 index 29e34bc2..654cc5a9 160000 --- a/CMakeModules +++ b/CMakeModules @@ -1 +1 @@ -Subproject commit 29e34bc2afc40890dc8532b85013de12432d68c5 +Subproject commit 654cc5a92a661348ac991640fe9cd1577227f26e diff --git a/wgrib2/CMakeLists.txt b/wgrib2/CMakeLists.txt index c37fcec1..170f4a7c 100644 --- 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 $ ${callable_src}) +add_library(wgrib2_lib $ $ ${callable_src}) # library and executable have same name (wgrib2) but different target names set_target_properties(wgrib2_lib PROPERTIES OUTPUT_NAME wgrib2)