From 5ccd66db73efa4f49480a439510f421ab08067bc Mon Sep 17 00:00:00 2001 From: yangwei Date: Fri, 30 Aug 2024 14:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=84=20refactor(rename=20vendor):=20fro?= =?UTF-8?q?m=20vendor=20to=20vendors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- {vendor => vendors}/CMakeLists.txt | 7 ++++--- {vendor => vendors}/brotli-v1.0.9.tar.gz | Bin {vendor => vendors}/googletest-release-1.8.0.tar.gz | Bin {vendor => vendors}/libcjson_v1.7.17.tar.gz | Bin {vendor => vendors}/llhttp-release-v9.2.1.tar.gz | Bin 6 files changed, 5 insertions(+), 4 deletions(-) rename {vendor => vendors}/CMakeLists.txt (92%) rename {vendor => vendors}/brotli-v1.0.9.tar.gz (100%) rename {vendor => vendors}/googletest-release-1.8.0.tar.gz (100%) rename {vendor => vendors}/libcjson_v1.7.17.tar.gz (100%) rename {vendor => vendors}/llhttp-release-v9.2.1.tar.gz (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 611e0f4..62c9657 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ include_directories(${CMAKE_SOURCE_DIR}/deps) enable_testing() add_subdirectory(conf) -add_subdirectory(vendor) +add_subdirectory(vendors) add_subdirectory(deps) add_subdirectory(infra) add_subdirectory(decoders) diff --git a/vendor/CMakeLists.txt b/vendors/CMakeLists.txt similarity index 92% rename from vendor/CMakeLists.txt rename to vendors/CMakeLists.txt index f68d69f..deecc53 100644 --- a/vendor/CMakeLists.txt +++ b/vendors/CMakeLists.txt @@ -35,12 +35,12 @@ ExternalProject_Add(cjson PREFIX cjson ExternalProject_Get_Property(cjson INSTALL_DIR) message(STATUS "cjson will be installed in: ${INSTALL_DIR}") -file(MAKE_DIRECTORY ${INSTALL_DIR}/include/) +file(MAKE_DIRECTORY ${INSTALL_DIR}/src/cjson/include/) add_library(cjson-static STATIC IMPORTED GLOBAL) add_dependencies(cjson-static cjson) -set_property(TARGET cjson-static PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/vendor/cjson/src/cjson/libcjson.a) -set_property(TARGET cjson-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include/) +set_property(TARGET cjson-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/src/cjson/libcjson.a) +set_property(TARGET cjson-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/src/cjson/include/) #llhttp-9.1.3 ExternalProject_Add(llhttp PREFIX llhttp @@ -48,6 +48,7 @@ ExternalProject_Add(llhttp PREFIX llhttp URL_MD5 355ecc90e622035e3e1693a96a0c233b CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= -DBUILD_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS="-fPIC") ExternalProject_Get_Property(llhttp INSTALL_DIR) +message(STATUS "llhttp will be installed in: ${INSTALL_DIR}") file(MAKE_DIRECTORY ${INSTALL_DIR}/include) add_library(llhttp-static STATIC IMPORTED GLOBAL) diff --git a/vendor/brotli-v1.0.9.tar.gz b/vendors/brotli-v1.0.9.tar.gz similarity index 100% rename from vendor/brotli-v1.0.9.tar.gz rename to vendors/brotli-v1.0.9.tar.gz diff --git a/vendor/googletest-release-1.8.0.tar.gz b/vendors/googletest-release-1.8.0.tar.gz similarity index 100% rename from vendor/googletest-release-1.8.0.tar.gz rename to vendors/googletest-release-1.8.0.tar.gz diff --git a/vendor/libcjson_v1.7.17.tar.gz b/vendors/libcjson_v1.7.17.tar.gz similarity index 100% rename from vendor/libcjson_v1.7.17.tar.gz rename to vendors/libcjson_v1.7.17.tar.gz diff --git a/vendor/llhttp-release-v9.2.1.tar.gz b/vendors/llhttp-release-v9.2.1.tar.gz similarity index 100% rename from vendor/llhttp-release-v9.2.1.tar.gz rename to vendors/llhttp-release-v9.2.1.tar.gz