@@ -14,7 +14,7 @@ endif() | |||||
ExternalProject_Add(gflags_build | ExternalProject_Add(gflags_build | ||||
URL https://github.com/gflags/gflags/archive/v2.2.2.tar.gz | 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 | #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | ||||
SOURCE_DIR ${GE_CODE_DIR}/../third_party/gflags/src/gflags-2.2.2 | |||||
#SOURCE_DIR ${GE_CODE_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> | 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) | BUILD_COMMAND $(MAKE) | ||||
INSTALL_COMMAND $(MAKE) install | INSTALL_COMMAND $(MAKE) install | ||||
@@ -8,7 +8,7 @@ set(JSON_SRC_DIR ${GE_CODE_DIR}/../third_party/json/include) | |||||
ExternalProject_Add(json_build | ExternalProject_Add(json_build | ||||
URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip | URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip | ||||
#URL /home/txd/workspace/cloud_code/pkg/include.zip | #URL /home/txd/workspace/cloud_code/pkg/include.zip | ||||
SOURCE_DIR ${JSON_SRC_DIR} | |||||
#SOURCE_DIR ${JSON_SRC_DIR} | |||||
CONFIGURE_COMMAND "" | CONFIGURE_COMMAND "" | ||||
BUILD_COMMAND "" | BUILD_COMMAND "" | ||||
INSTALL_COMMAND "" | INSTALL_COMMAND "" | ||||
@@ -16,7 +16,7 @@ ExternalProject_Add(protobuf_build | |||||
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz | 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 | #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | ||||
#SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 | #SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 | ||||
DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 <SOURCE_DIR> | |||||
#DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 <SOURCE_DIR> | |||||
#CONFIGURE_COMMAND ${CMAKE_COMMAND} | #CONFIGURE_COMMAND ${CMAKE_COMMAND} | ||||
#-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} | #-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} | ||||
#-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | #-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | ||||
@@ -14,7 +14,7 @@ set(PROTOBUF_STATIC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf_static) | |||||
ExternalProject_Add(protobuf_static_build | ExternalProject_Add(protobuf_static_build | ||||
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz | 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 | #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | ||||
SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 | |||||
#SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 | |||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} | CONFIGURE_COMMAND ${CMAKE_COMMAND} | ||||
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | ||||
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} | -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} | ||||
@@ -17,7 +17,7 @@ set(protobuf_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") | |||||
ExternalProject_Add(protoc_build | ExternalProject_Add(protoc_build | ||||
URL https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz | 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 | #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz | ||||
SOURCE_DIR ${GE_CODE_DIR}/../third_party/protobuf/src/protobuf-3.8.0 | |||||
#SOURCE_DIR ${GE_CODE_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 | 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) | BUILD_COMMAND $(MAKE) | ||||
INSTALL_COMMAND $(MAKE) install | INSTALL_COMMAND $(MAKE) install | ||||
@@ -1 +1 @@ | |||||
Subproject commit 89b3567f68663610dc17d579d1d1a411869d7cbf | |||||
Subproject commit e79f45025b95a7295bdffa38a1b720bfd6609ae9 |
@@ -1 +1 @@ | |||||
Subproject commit c53d788e913c739e05021e86043267780ea13fb4 | |||||
Subproject commit be653a17038395f3901d43b600a51f6ab33af5e5 |