From e7eb6074a3013f72fcbb9c00d635cb6fd59c9dae Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Fri, 16 Oct 2020 18:10:08 +0800 Subject: [PATCH] update libs cmake --- cmake/external_libs/gflags.cmake | 2 +- cmake/external_libs/json.cmake | 2 +- cmake/external_libs/protobuf_shared.cmake | 2 +- cmake/external_libs/protoc.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/external_libs/gflags.cmake b/cmake/external_libs/gflags.cmake index d3f984d..87a7422 100755 --- a/cmake/external_libs/gflags.cmake +++ b/cmake/external_libs/gflags.cmake @@ -14,7 +14,7 @@ endif() ExternalProject_Add(gflags_build URL https://github.com/gflags/gflags/archive/v2.2.2.tar.gz #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz - SOURCE_DIR ${PARSER_DIR}/../third_party/gflags/src/gflags-2.2.2 + SOURCE_DIR ${PARSER_DIR}/../../third_party/gflags/src/gflags-2.2.2 CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags BUILD_COMMAND $(MAKE) INSTALL_COMMAND $(MAKE) install diff --git a/cmake/external_libs/json.cmake b/cmake/external_libs/json.cmake index 61fdab4..ac259a4 100755 --- a/cmake/external_libs/json.cmake +++ b/cmake/external_libs/json.cmake @@ -4,7 +4,7 @@ endif() include(ExternalProject) -set(JSON_SRC_DIR ${PARSER_DIR}/../third_party/json/include) +set(JSON_SRC_DIR ${PARSER_DIR}/../../third_party/json/include) ExternalProject_Add(json_build URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip #URL /home/txd/workspace/cloud_code/pkg/include.zip diff --git a/cmake/external_libs/protobuf_shared.cmake b/cmake/external_libs/protobuf_shared.cmake index a049086..8fbc35e 100755 --- a/cmake/external_libs/protobuf_shared.cmake +++ b/cmake/external_libs/protobuf_shared.cmake @@ -16,7 +16,7 @@ set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") ExternalProject_Add(protobuf_build URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz - #SOURCE_DIR ${PARSER_DIR}/third_party/protobuf/src/protobuf-3.8.0 + #SOURCE_DIR ${PARSER_DIR}/../../third_party/protobuf/src/protobuf-3.8.0 DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0 #CONFIGURE_COMMAND ${CMAKE_COMMAND} #-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} diff --git a/cmake/external_libs/protoc.cmake b/cmake/external_libs/protoc.cmake index e23671f..a6100db 100755 --- a/cmake/external_libs/protoc.cmake +++ b/cmake/external_libs/protoc.cmake @@ -17,7 +17,7 @@ set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") ExternalProject_Add(protoc_build URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz - SOURCE_DIR ${PARSER_DIR}/../third_party/protobuf/src/protobuf-3.8.0 + SOURCE_DIR ${PARSER_DIR}/../../third_party/protobuf/src/protobuf-3.8.0 CONFIGURE_COMMAND ${CMAKE_COMMAND} -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=${protobuf_CXXFLAGS} -DCMAKE_CXX_LDFLAGS=${protobuf_LDFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/protoc /cmake BUILD_COMMAND $(MAKE) INSTALL_COMMAND $(MAKE) install