Embed libjsonparser

iliaplatone · Mar 3, 2022 · b5abae2 · b5abae2
1 parent 79dfed8
commit b5abae2
Show file tree

Hide file tree

Showing 7 changed files with 1,294 additions and 69 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,9 +13,9 @@ find_package(JPEG REQUIRED)
 find_package(FFTW3 REQUIRED)
 find_package(Threads REQUIRED)
 option(WITH_VLBI_SERVER "Add OpenVLBI servers" ON)
-option(WITH_INDI_SERVER "Add INDI server for OpenVLBI" OFF)
+option(WITH_INDI_SERVER "Add INDI server for OpenVLBI" ON)
 option(WITH_DUMMY_SERVER "Add dummy server for OpenVLBI" ON)
-option(WITH_JSON_SERVER "Add JSON server for OpenVLBI" OFF)
+option(WITH_JSON_SERVER "Add JSON server for OpenVLBI" ON)
 
 set (VLBI_VERSION_MAJOR 1)
 set (VLBI_VERSION_MINOR 22)
@@ -95,13 +95,9 @@ add_library(openvlbi_server STATIC ${CMAKE_CURRENT_SOURCE_DIR}/vlbi_server.cpp)
 install(TARGETS openvlbi_server ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
 
 if(WITH_JSON_SERVER)
-find_package(JSONPARSER REQUIRED)
-if(JSONPARSER_LIBRARIES)
-include_directories( ${JSONPARSER_INCLUDE_DIR})
-add_executable(vlbi_server_json ${CMAKE_CURRENT_SOURCE_DIR}/vlbi_server_json.cpp ${CMAKE_CURRENT_SOURCE_DIR}/vlbi/instancecollection.cpp)
-target_link_libraries(vlbi_server_json openvlbi openvlbi_server ${JSONPARSER_LIBRARIES} ${CFITSIO_LIBRARIES} ${M_LIB} ${ZLIB_LIBRARY})
+add_executable(vlbi_server_json ${CMAKE_CURRENT_SOURCE_DIR}/json.c ${CMAKE_CURRENT_SOURCE_DIR}/vlbi_server_json.cpp ${CMAKE_CURRENT_SOURCE_DIR}/vlbi/instancecollection.cpp)
+target_link_libraries(vlbi_server_json openvlbi openvlbi_server ${CFITSIO_LIBRARIES} ${M_LIB} ${ZLIB_LIBRARY})
 install(TARGETS vlbi_server_json RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif(JSONPARSER_LIBRARIES)
 endif(WITH_JSON_SERVER)
 
 if(WITH_INDI_SERVER)

diff --git a/README.md b/README.md
@@ -27,9 +27,8 @@ If everything will be successful three .deb packages will be built and installed
 ## Other OSes
 
 You'll need CMake to build OpenVLBI, and some developement packages:
-+ **libopenvlbi**:libfftw3
-+ **vlbi_server_json**: libjsonparser
-+ **vlbi_server_indi**: libindi libnova libcfitsio
++ **libopenvlbi**:libfftw3 libcfitsio libjpeg libpng
++ **vlbi_server_indi**: libindi libnova
 + **tests and scripts**: jq
 
 # Using OpenVLBI

diff --git a/cmake_modules/FindJSONPARSER.cmake b/cmake_modules/FindJSONPARSER.cmake
diff --git a/debian/control b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 8.1.3~),
  cdbs,
  cmake (>= 2.4.7),
  cmake-data,
- libindi-dev (>= 1.8.8),
+# libindi-dev (>= 1.8.8),
  libnova-dev,
  libfftw3-dev,
  libcfitsio-dev,