Browse Source

modified: cmake/external_libs/gflags.cmake

modified:   cmake/external_libs/protobuf_shared.cmake
	modified:   cmake/external_libs/protobuf_static.cmake
pull/198/head
zhaoxinxin 4 years ago
parent
commit
700ace4728
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      cmake/external_libs/gflags.cmake
  2. +1
    -1
      cmake/external_libs/protobuf_shared.cmake
  3. +1
    -1
      cmake/external_libs/protobuf_static.cmake

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

@@ -6,7 +6,7 @@ include(ExternalProject)

if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
(${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}.")
endif()



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

@@ -7,7 +7,7 @@ include(GNUInstallDirs)

if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR
(${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}.")
endif()



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

@@ -14,7 +14,7 @@ set(PROTOBUF_STATIC_PKG_DIR ${CMAKE_INSTALL_PREFIX}/protobuf_static)
ExternalProject_Add(protobuf_static_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 ${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}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}


Loading…
Cancel
Save