Browse Source

remove cache

tags/v1.1.0
taoxiangdong 3 years ago
parent
commit
fd4e6e9175
6 changed files with 13 additions and 7 deletions
  1. +2
    -1
      cmake/external_libs/gflags.cmake
  2. +2
    -1
      cmake/external_libs/json.cmake
  3. +2
    -1
      cmake/external_libs/protobuf_shared.cmake
  4. +2
    -1
      cmake/external_libs/protoc.cmake
  5. +3
    -2
      cmake/external_libs/securec.cmake
  6. +2
    -1
      cmake/intf_pub_linux.cmake

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

@@ -35,4 +35,5 @@ target_link_libraries(gflags INTERFACE gflags_static)

add_dependencies(gflags gflags_build)

set(HAVE_GFLAGS TRUE CACHE BOOL "gflags build add")
#set(HAVE_GFLAGS TRUE CACHE BOOL "gflags build add")
set(HAVE_GFLAGS TRUE)

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

@@ -20,4 +20,5 @@ add_library(json INTERFACE)
target_include_directories(json INTERFACE ${JSON_SRC_DIR})
add_dependencies(json json_build)

set(HAVE_JSON TRUE CACHE BOOL "json build add")
#set(HAVE_JSON TRUE CACHE BOOL "json build add")
set(HAVE_JSON TRUE)

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

@@ -55,4 +55,5 @@ install(FILES ${PROTOBUF_SHARED_PKG_DIR}/lib/libprotobuf.so ${PROTOBUF_SHARED_PK

add_dependencies(protobuf protobuf_build)

set(HAVE_PROTOBUF TRUE CACHE BOOL "protobuf build add")
#set(HAVE_PROTOBUF TRUE CACHE BOOL "protobuf build add")
set(HAVE_PROTOBUF TRUE)

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

@@ -99,4 +99,5 @@ function(protobuf_generate_py comp py_var)
endfunction()
set(HAVE_PROTOC TRUE CACHE BOOL "protoc build add")
#set(HAVE_PROTOC TRUE CACHE BOOL "protoc build add")
set(HAVE_PROTOC TRUE)

+ 3
- 2
cmake/external_libs/securec.cmake View File

@@ -14,7 +14,7 @@ ExternalProject_Add(c_sec_build
URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz
#URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
#SOURCE_DIR ${GE_CODE_DIR}/../libc_sec
PATCH_COMMAND patch -p1 < ${METADEF_DIR}/third_party/patch/securec/0001-add-securec-cmake-script.patch
PATCH_COMMAND patch -p1 < ${GE_CODE_DIR}/metadef/third_party/patch/securec/0001-add-securec-cmake-script.patch
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -58,4 +58,5 @@ target_link_libraries(c_sec_static INTERFACE c_sec_static_lib)

add_dependencies(c_sec_static c_sec_build)

set(HAVE_C_SEC TRUE CACHE BOOL "c_sec build add")
#set(HAVE_C_SEC TRUE CACHE BOOL "c_sec build add")
set(HAVE_C_SEC TRUE)

+ 2
- 1
cmake/intf_pub_linux.cmake View File

@@ -29,4 +29,5 @@ target_link_libraries(intf_pub INTERFACE
-lpthread
)

set(HAVE_PUB TRUE CACHE BOOL "pub add")
#set(HAVE_PUB TRUE CACHE BOOL "pub add")
set(HAVE_PUB TRUE)

Loading…
Cancel
Save