Scripts

README.md

@@ -2,7 +2,7 @@
 
 Proto files here are used in [STAC](https://github.com/nearspacelabs/stac-python-client) service and in [geometry service](https://github.com/geo-grpc/geometry-chain)
 
-Build new versions using `generate.sh` from proto directory (requires docker):
+Build new versions using `generate.sh` from within proto directory (requires docker):
 ```bash
 ./generate.sh
 ```

copy_mono.sh

@@ -10,5 +10,5 @@ cp ../../nearspacelabs/mono/java/geometry-chain/settings.gradle ./java/geometry-
 
 # Copy Python from mono
 cp -r ../../nearspacelabs/mono/python/epl_geometry ./python
-cp -r ../../nearspacelabs/mono/python/epl_protobuf ./python
+cp -r ../../nearspacelabs/mono/python/epl_protobuf_v1 ./python
 # Copy Python from mono

cpp/CMakeLists.txt

@@ -19,7 +19,7 @@ else()
             /usr/lib/x86_64-linux-gnu/libjansson.so)
 endif()
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/protobuf-lib)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/epl-protobuf-v1)
 
 if (APPLE)
     set(PROJECT_INCLUDES ${CMAKE_SOURCE_DIR}/src /usr/local/include/google/protobuf)
@@ -29,7 +29,7 @@ endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
-target_link_libraries(protobuf_lib)
+target_link_libraries(epl_protobuf_v1)
 
 enable_testing()
 

cpp/epl-protobuf-v1/CMakeLists.txt

@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.13.4)
+project(epl_protobuf_v1)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake")
+
+find_package(Protobuf REQUIRED)
+find_package(GRPC REQUIRED)
+
+set(protobuf_MODULE_COMPATIBLE TRUE)
+
+message(STATUS "Using protobuf ${protobuf_VERSION}")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+
+set(${PROJECT_NAME}_INCLUDE
+        /usr/local/include
+        ${PROTO_SRC_DIR}
+        /usr/local/include/grpc++
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1
+        CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
+
+include_directories(${${PROJECT_NAME}_INCLUDE})
+
+add_library(${PROJECT_NAME}
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/geometry.pb.cc
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/geometry.pb.h
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/geometry_service.grpc.pb.cc
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/geometry_service.grpc.pb.h
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/geometry_service.pb.cc
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/geometry_service.pb.h
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/query.pb.cc
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/query.pb.h
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/stac.pb.cc
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/stac.pb.h
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/stac_service.grpc.pb.cc
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/stac_service.grpc.pb.h
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/stac_service.pb.cc
+        ${CMAKE_SOURCE_DIR}/epl-protobuf-v1/epl/protobuf/v1/stac_service.pb.h
+        )
+
+target_link_libraries(${PROJECT_NAME}
+        gRPC::grpc++_reflection
+        protobuf::libprotobuf)