Browse Source
modified: cmake/external_libs/gflags.cmake
modified: cmake/external_libs/protobuf_shared.cmake modified: cmake/external_libs/protobuf_static.cmaketags/v1.1.0
zhaoxinxin
4 years ago
3 changed files with 4 additions and 4 deletions
Unified View
Diff Options
-
+2 -2cmake/external_libs/gflags.cmake
-
+1 -1cmake/external_libs/protobuf_shared.cmake
-
+1 -1cmake/external_libs/protobuf_static.cmake
+ 2
- 2
cmake/external_libs/gflags.cmake
View File
| @@ -6,7 +6,7 @@ include(ExternalProject) | |||||
| if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | ||||
| (${CMAKE_INSTALL_PREFIX} STREQUAL "C:/Program Files (x86)/ascend")) | (${CMAKE_INSTALL_PREFIX} STREQUAL "C:/Program Files (x86)/ascend")) | ||||
| set(CMAKE_INSTALL_PREFIX ${METADEF_DIR}/output CACHE STRING "path for install()" FORCE) | |||||
| set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output CACHE STRING "path for install()" FORCE) | |||||
| message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | ||||
| endif() | endif() | ||||
| @@ -22,7 +22,7 @@ set (gflags_CXXFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 -Dgoogle=ascend_private") | |||||
| ExternalProject_Add(gflags_build | ExternalProject_Add(gflags_build | ||||
| URL ${REQ_URL} | URL ${REQ_URL} | ||||
| #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 ${METADEF_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=${gflags_CXXFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags <SOURCE_DIR> | CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_CXX_FLAGS=${gflags_CXXFLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/gflags <SOURCE_DIR> | ||||
| BUILD_COMMAND $(MAKE) | BUILD_COMMAND $(MAKE) | ||||
| INSTALL_COMMAND $(MAKE) install | INSTALL_COMMAND $(MAKE) install | ||||
+ 1
- 1
cmake/external_libs/protobuf_shared.cmake
View File
| @@ -7,7 +7,7 @@ include(GNUInstallDirs) | |||||
| if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | ||||
| (${CMAKE_INSTALL_PREFIX} STREQUAL "C:/Program Files (x86)/ascend")) | (${CMAKE_INSTALL_PREFIX} STREQUAL "C:/Program Files (x86)/ascend")) | ||||
| set(CMAKE_INSTALL_PREFIX ${METADEF_DIR}/output CACHE STRING "path for install()" FORCE) | |||||
| set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output CACHE STRING "path for install()" FORCE) | |||||
| message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | ||||
| endif() | endif() | ||||
+ 1
- 1
cmake/external_libs/protobuf_static.cmake
View File
| @@ -22,7 +22,7 @@ set(PROTOBUF_STATIC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf_static) | |||||
| ExternalProject_Add(protobuf_static_build | ExternalProject_Add(protobuf_static_build | ||||
| URL ${REQ_URL} | URL ${REQ_URL} | ||||
| #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 ${METADEF_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} | ||||