CXXCBC-303: build jsonsl with the library

At this stage, we rather own jsonsl implementation, and it would be easier to compile and maintain it as a part of the main source set.
couchbase · Sep 16, 2024 · 670bf20 · 670bf20
1 parent 795fb78
commit 670bf20
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 107 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -427,6 +427,7 @@ set(couchbase_cxx_client_FILES
     core/columnar/query_component.cxx
     core/columnar/query_result.cxx
     core/columnar/backoff_calculator.cxx
+    third_party/jsonsl/jsonsl.c
 )
 
 if(COUCHBASE_CXX_CLIENT_BUILD_SHARED OR BUILD_SHARED_LIBS)

diff --git a/cmake/ThirdPartyDependencies.cmake b/cmake/ThirdPartyDependencies.cmake
@@ -224,10 +224,6 @@ endif()
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/cxx_function)
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/expected/include)
 
-add_library(jsonsl OBJECT ${PROJECT_SOURCE_DIR}/third_party/jsonsl/jsonsl.c)
-set_target_properties(jsonsl PROPERTIES C_VISIBILITY_PRESET hidden POSITION_INDEPENDENT_CODE TRUE)
-target_include_directories(jsonsl SYSTEM PUBLIC ${PROJECT_SOURCE_DIR}/third_party/jsonsl)
-
 declare_system_library(snappy)
 declare_system_library(llhttp::llhttp)
 declare_system_library(hdr_histogram_static)