diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt index 5260092fd1c4546fb0767964aba5afbf6ce195f4..5521e489e63182f8615428976d1c77c9f826abec 100644 --- a/src/box/CMakeLists.txt +++ b/src/box/CMakeLists.txt @@ -49,7 +49,7 @@ add_library(tuple STATIC field_def.c opt_def.c ) -target_link_libraries(tuple json_path box_error core ${MSGPUCK_LIBRARIES} ${ICU_LIBRARIES} misc bit) +target_link_libraries(tuple json box_error core ${MSGPUCK_LIBRARIES} ${ICU_LIBRARIES} misc bit) add_library(xlog STATIC xlog.c) target_link_libraries(xlog core box_error crc32 ${ZSTD_LIBRARIES}) diff --git a/src/lib/json/CMakeLists.txt b/src/lib/json/CMakeLists.txt index 51a1f027a8cbcd9a832ea26c24eca52f0dc36fe1..4462ee2d7043ecfaa41b053929b96214484acce8 100644 --- a/src/lib/json/CMakeLists.txt +++ b/src/lib/json/CMakeLists.txt @@ -3,5 +3,5 @@ set(lib_sources ) set_source_files_compile_flags(${lib_sources}) -add_library(json_path STATIC ${lib_sources}) -target_link_libraries(json_path misc) +add_library(json STATIC ${lib_sources}) +target_link_libraries(json misc) diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index aac86f9e71ca425287f83209c552fda1eeb849cb..7cba5cbb9b8091bb3cbe2a6037a909614866a758 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -129,8 +129,8 @@ add_executable(reflection_cxx.test reflection_cxx.cc unit.c add_executable(csv.test csv.c) target_link_libraries(csv.test csv) -add_executable(json_path.test json_path.c) -target_link_libraries(json_path.test json_path unit ${ICU_LIBRARIES}) +add_executable(json.test json.c) +target_link_libraries(json.test json unit ${ICU_LIBRARIES}) add_executable(rmean.test rmean.cc) target_link_libraries(rmean.test stat unit) diff --git a/test/unit/json_path.c b/test/unit/json.c similarity index 100% rename from test/unit/json_path.c rename to test/unit/json.c diff --git a/test/unit/json_path.result b/test/unit/json.result similarity index 100% rename from test/unit/json_path.result rename to test/unit/json.result