From fd4e6e9175608bce10aa756fe26e69704a4ae883 Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Tue, 20 Oct 2020 01:47:29 +0800 Subject: [PATCH] remove cache --- cmake/external_libs/gflags.cmake | 3 ++- cmake/external_libs/json.cmake | 3 ++- cmake/external_libs/protobuf_shared.cmake | 3 ++- cmake/external_libs/protoc.cmake | 3 ++- cmake/external_libs/securec.cmake | 5 +++-- cmake/intf_pub_linux.cmake | 3 ++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cmake/external_libs/gflags.cmake b/cmake/external_libs/gflags.cmake index bed64400..022f0414 100755 --- a/cmake/external_libs/gflags.cmake +++ b/cmake/external_libs/gflags.cmake @@ -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) diff --git a/cmake/external_libs/json.cmake b/cmake/external_libs/json.cmake index bb19d64e..9aa98b77 100755 --- a/cmake/external_libs/json.cmake +++ b/cmake/external_libs/json.cmake @@ -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) diff --git a/cmake/external_libs/protobuf_shared.cmake b/cmake/external_libs/protobuf_shared.cmake index fd2aa695..da16b498 100755 --- a/cmake/external_libs/protobuf_shared.cmake +++ b/cmake/external_libs/protobuf_shared.cmake @@ -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) diff --git a/cmake/external_libs/protoc.cmake b/cmake/external_libs/protoc.cmake index 4ea1bbec..33389667 100755 --- a/cmake/external_libs/protoc.cmake +++ b/cmake/external_libs/protoc.cmake @@ -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) diff --git a/cmake/external_libs/securec.cmake b/cmake/external_libs/securec.cmake index 10ba5b22..0bd62ab2 100755 --- a/cmake/external_libs/securec.cmake +++ b/cmake/external_libs/securec.cmake @@ -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) diff --git a/cmake/intf_pub_linux.cmake b/cmake/intf_pub_linux.cmake index a98fee07..40c6bca9 100755 --- a/cmake/intf_pub_linux.cmake +++ b/cmake/intf_pub_linux.cmake @@ -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)