diff options
| author | zhengchao <[email protected]> | 2018-09-26 19:30:15 +0800 |
|---|---|---|
| committer | zhengchao <[email protected]> | 2018-09-26 19:30:15 +0800 |
| commit | a49222cc1d8a1902c8a42ab33014bc8277d34423 (patch) | |
| tree | 26ddfc5d281e994e93508dd2e89ae2c72bf56712 /vendor | |
| parent | 4d5b5f1f4523b65ef9ce72e16fe816ac55838271 (diff) | |
1)hiredis-vip静态链接到maat；2)maat_redis_tool静态链接libmaatframe.a;3)增加文件删除的测试用例。
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | vendor/googletest-release-1.8.0.tar.gz | bin | 0 -> 1281617 bytes | |||
| -rw-r--r-- | vendor/hiredis-vip-0.3.0.tar.gz | bin | 0 -> 89575 bytes |
3 files changed, 17 insertions, 13 deletions
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 2d8dc72..52db358 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -2,12 +2,12 @@ include(ExternalProject) #### GoogleTest -ExternalProject_Add(googletest PREFIX googletest +ExternalProject_Add(GoogleTest PREFIX GoogleTest URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-release-1.8.0.tar.gz URL_MD5 16877098823401d1bf2ed7891d7dce36 CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) -ExternalProject_Get_Property(googletest INSTALL_DIR) +ExternalProject_Get_Property(GoogleTest INSTALL_DIR) file(MAKE_DIRECTORY ${INSTALL_DIR}/include) add_library(gtest STATIC IMPORTED GLOBAL) @@ -15,14 +15,18 @@ set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgtest set_property(TARGET gtest PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) set_property(TARGET gtest PROPERTY INTERFACE_LINK_LIBRARIES pthread) -#### hiredis-vip -#ExternalProject_Add(hiredis-vip PREFIX hiredis-vip -# URL ${CMAKE_CURRENT_SOURCE_DIR}/hiredis-vip-0.3.0.tar.gz -# URL_MD5 e4d4a2928188b11f696d35ca1c52e9a4 -# CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) -# -#ExternalProject_Get_Property(hiredis-vip INSTALL_DIR) -#file(MAKE_DIRECTORY ${INSTALL_DIR}/include) -# -#add_library(hiredisv STATIC IMPORTED GLOBAL) -#set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/libhiredis_vip.a) +ExternalProject_Add(hiredis-vip PREFIX hiredis-vip + URL ${CMAKE_CURRENT_SOURCE_DIR}/hiredis-vip-0.3.0.tar.gz + URL_MD5 e4d4a2928188b11f696d35ca1c52e9a4 + CONFIGURE_COMMAND "" + BUILD_COMMAND make + INSTALL_COMMAND "" + BUILD_IN_SOURCE 1) + +ExternalProject_Get_Property(hiredis-vip SOURCE_DIR) +set(HTTP_PARSER_INCLUDE_DIRECTORIES ${SOURCE_DIR}) +file(MAKE_DIRECTORY ${HTTP_PARSER_INCLUDE_DIRECTORIES}) + +add_library(hiredis-vip-static STATIC IMPORTED GLOBAL) +set_property(TARGET hiredis-vip-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/libhiredis_vip.a) +set_property(TARGET hiredis-vip-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}) diff --git a/vendor/googletest-release-1.8.0.tar.gz b/vendor/googletest-release-1.8.0.tar.gz Binary files differnew file mode 100644 index 0000000..a40df33 --- /dev/null +++ b/vendor/googletest-release-1.8.0.tar.gz diff --git a/vendor/hiredis-vip-0.3.0.tar.gz b/vendor/hiredis-vip-0.3.0.tar.gz Binary files differnew file mode 100644 index 0000000..cf88a1b --- /dev/null +++ b/vendor/hiredis-vip-0.3.0.tar.gz |