Merge branch 'master' of github.com:forefireAPI/firefront

forefireAPI · Jan 17, 2024 · bd165a4 · bd165a4
2 parents 31e34d1 + 2b8e50b
commit bd165a4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ project(forefire VERSION 1.0)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/../bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../lib)
 
-link_libraries("-lnetcdf_c++ -lnetcdf")
+link_libraries("-lnetcdf_c++4 -lnetcdf")
 
 file(GLOB_RECURSE SRC_FILES src/*.cpp)
 

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update
 
 RUN apt install build-essential -y
 
-RUN apt install libnetcdf-dev libnetcdf-c++4-dev -y
+RUN apt install libnetcdf-dev libnetcdf-cxx-legacy-dev libnetcdf-c++4-dev -y
 
 RUN apt install cmake -y
 

diff --git a/install-forefire.sh b/install-forefire.sh
@@ -5,7 +5,7 @@ apt-get update
 
 apt install build-essential -y
 
-apt install libnetcdf-dev libnetcdf-cxx-legacy-dev -y
+apt install libnetcdf-dev libnetcdf-cxx-legacy-dev libnetcdf-c++4-dev -y
 
 apt install cmake scons -y
 

diff --git a/py3_tools/forefirepy/ForeFire.py b/py3_tools/forefirepy/ForeFire.py
@@ -4,7 +4,7 @@
 
 class Forefire:
 
-  version = '1.1.20'
+  version = '2.0.0'
 
   def __init__(self):
     self.ff = '''setParameter[dumpMode=geojson]