Browse Source

update libs cmake

pull/11/head
taoxiangdong 4 years ago
parent
commit
e7eb6074a3
4 changed files with 4 additions and 4 deletions
  1. +1
    -1
      cmake/external_libs/gflags.cmake
  2. +1
    -1
      cmake/external_libs/json.cmake
  3. +1
    -1
      cmake/external_libs/protobuf_shared.cmake
  4. +1
    -1
      cmake/external_libs/protoc.cmake

+ 1
- 1
cmake/external_libs/gflags.cmake View File

@@ -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 <SOURCE_DIR>
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install


+ 1
- 1
cmake/external_libs/json.cmake View File

@@ -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


+ 1
- 1
cmake/external_libs/protobuf_shared.cmake View File

@@ -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 <SOURCE_DIR>
#CONFIGURE_COMMAND ${CMAKE_COMMAND}
#-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}


+ 1
- 1
cmake/external_libs/protoc.cmake View File

@@ -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 <SOURCE_DIR>/cmake
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install


Loading…
Cancel
Save