diff options
| author | yangwei <[email protected]> | 2024-08-30 14:40:54 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2024-08-30 14:40:54 +0800 |
| commit | 5ccd66db73efa4f49480a439510f421ab08067bc (patch) | |
| tree | 3ade3ad0e9bd4afd6bfb9f6cec76b06acdacded8 | |
| parent | 02a50d1008631c56539b0d0fe1c047e62797659c (diff) | |
🦄 refactor(rename vendor): from vendor to vendors
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vendors/CMakeLists.txt (renamed from vendor/CMakeLists.txt) | 7 | ||||
| -rw-r--r-- | vendors/brotli-v1.0.9.tar.gz (renamed from vendor/brotli-v1.0.9.tar.gz) | bin | 486984 -> 486984 bytes | |||
| -rw-r--r-- | vendors/googletest-release-1.8.0.tar.gz (renamed from vendor/googletest-release-1.8.0.tar.gz) | bin | 1281617 -> 1281617 bytes | |||
| -rw-r--r-- | vendors/libcjson_v1.7.17.tar.gz (renamed from vendor/libcjson_v1.7.17.tar.gz) | bin | 354666 -> 354666 bytes | |||
| -rw-r--r-- | vendors/llhttp-release-v9.2.1.tar.gz (renamed from vendor/llhttp-release-v9.2.1.tar.gz) | bin | 37786 -> 37786 bytes |
6 files changed, 5 insertions, 4 deletions
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 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=<INSTALL_DIR> -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 Binary files differindex 0d717bb..0d717bb 100644 --- a/vendor/brotli-v1.0.9.tar.gz +++ b/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 Binary files differindex a40df33..a40df33 100644 --- a/vendor/googletest-release-1.8.0.tar.gz +++ b/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 Binary files differindex 5d023fc..5d023fc 100644 --- a/vendor/libcjson_v1.7.17.tar.gz +++ b/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 Binary files differindex b11dd34..b11dd34 100644 --- a/vendor/llhttp-release-v9.2.1.tar.gz +++ b/vendors/llhttp-release-v9.2.1.tar.gz |