From f6fa18e7ecc4b412f78fd0d6fea0053c0a2e67ab Mon Sep 17 00:00:00 2001 From: Angelo Puglisi Date: Wed, 25 Nov 2020 09:58:29 +0100 Subject: [PATCH] chore(cmake): mark some variables as advanced Have some cmake variables (e.g. *_INCLUDE and *_LIB) marked as advanced, in order to have a cleaner ccmake menu. Signed-off-by: Angelo Puglisi --- cmake/modules/OpenSSL.cmake | 3 +++ cmake/modules/gRPC.cmake | 7 +++++++ cmake/modules/jq.cmake | 1 + cmake/modules/static-analysis.cmake | 1 + cmake/modules/yaml-cpp.cmake | 1 + 5 files changed, 13 insertions(+) diff --git a/cmake/modules/OpenSSL.cmake b/cmake/modules/OpenSSL.cmake index 3c78774f..f7cbea0f 100644 --- a/cmake/modules/OpenSSL.cmake +++ b/cmake/modules/OpenSSL.cmake @@ -10,6 +10,7 @@ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the # specific language governing permissions and limitations under the License. # +mark_as_advanced(OPENSSL_BINARY) if(NOT USE_BUNDLED_DEPS) find_package(OpenSSL REQUIRED) message(STATUS "Found openssl: include: ${OPENSSL_INCLUDE_DIR}, lib: ${OPENSSL_LIBRARIES}") @@ -20,6 +21,8 @@ if(NOT USE_BUNDLED_DEPS) message(STATUS "Found openssl: binary: ${OPENSSL_BINARY}") endif() else() + mark_as_advanced(OPENSSL_BUNDLE_DIR OPENSSL_INSTALL_DIR OPENSSL_INCLUDE_DIR + OPENSSL_LIBRARY_SSL OPENSSL_LIBRARY_CRYPTO) set(OPENSSL_BUNDLE_DIR "${PROJECT_BINARY_DIR}/openssl-prefix/src/openssl") set(OPENSSL_INSTALL_DIR "${OPENSSL_BUNDLE_DIR}/target") set(OPENSSL_INCLUDE_DIR "${PROJECT_BINARY_DIR}/openssl-prefix/src/openssl/include") diff --git a/cmake/modules/gRPC.cmake b/cmake/modules/gRPC.cmake index 41841627..aae9e274 100644 --- a/cmake/modules/gRPC.cmake +++ b/cmake/modules/gRPC.cmake @@ -22,6 +22,7 @@ if(NOT USE_BUNDLED_DEPS) endif() # c-ares + mark_as_advanced(CARES_INCLUDE CARES_LIB) find_path(CARES_INCLUDE NAMES ares.h) find_library(CARES_LIB NAMES libcares.so) if(CARES_INCLUDE AND CARES_LIB) @@ -31,6 +32,7 @@ if(NOT USE_BUNDLED_DEPS) endif() # protobuf + mark_as_advanced(PROTOC PROTOBUF_INCLUDE PROTOBUF_LIB) find_program(PROTOC NAMES protoc) find_path(PROTOBUF_INCLUDE NAMES google/protobuf/message.h) find_library(PROTOBUF_LIB NAMES libprotobuf.so) @@ -43,6 +45,7 @@ if(NOT USE_BUNDLED_DEPS) endif() # gpr + mark_as_advanced(GPR_LIB) find_library(GPR_LIB NAMES gpr) if(GPR_LIB) @@ -52,12 +55,16 @@ if(NOT USE_BUNDLED_DEPS) endif() # gRPC todo(fntlnz, leodido): check that gRPC version is greater or equal than 1.8.0 + mark_as_advanced(GRPC_INCLUDE GRPC_SRC + GRPC_LIB GRPC_LIBS_ABSOLUTE GRPCPP_LIB GRPC_CPP_PLUGIN) find_path(GRPCXX_INCLUDE NAMES grpc++/grpc++.h) if(GRPCXX_INCLUDE) set(GRPC_INCLUDE ${GRPCXX_INCLUDE}) + unset(GRPCXX_INCLUDE CACHE) else() find_path(GRPCPP_INCLUDE NAMES grpcpp/grpcpp.h) set(GRPC_INCLUDE ${GRPCPP_INCLUDE}) + unset(GRPCPP_INCLUDE CACHE) add_definitions(-DGRPC_INCLUDE_IS_GRPCPP=1) endif() find_library(GRPC_LIB NAMES grpc) diff --git a/cmake/modules/jq.cmake b/cmake/modules/jq.cmake index 8214f1d9..646782d4 100644 --- a/cmake/modules/jq.cmake +++ b/cmake/modules/jq.cmake @@ -10,6 +10,7 @@ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the # specific language governing permissions and limitations under the License. # +mark_as_advanced(JQ_INCLUDE JQ_LIB) if (NOT USE_BUNDLED_DEPS) find_path(JQ_INCLUDE jq.h PATH_SUFFIXES jq) find_library(JQ_LIB NAMES jq) diff --git a/cmake/modules/static-analysis.cmake b/cmake/modules/static-analysis.cmake index 4a0acecf..0d8152f6 100644 --- a/cmake/modules/static-analysis.cmake +++ b/cmake/modules/static-analysis.cmake @@ -3,6 +3,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/static-analysis-reports) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/static-analysis-reports/cppcheck) # cppcheck +mark_as_advanced(CPPCHECK CPPCHECK_HTMLREPORT) find_program(CPPCHECK cppcheck) find_program(CPPCHECK_HTMLREPORT cppcheck-htmlreport) diff --git a/cmake/modules/yaml-cpp.cmake b/cmake/modules/yaml-cpp.cmake index d1077d8b..005578ff 100644 --- a/cmake/modules/yaml-cpp.cmake +++ b/cmake/modules/yaml-cpp.cmake @@ -10,6 +10,7 @@ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the # specific language governing permissions and limitations under the License. # +mark_as_advanced(YAMLCPP_INCLUDE_DIR YAMLCPP_LIB) if(NOT USE_BUNDLED_DEPS) find_path(YAMLCPP_INCLUDE_DIR NAMES yaml-cpp/yaml.h) find_library(YAMLCPP_LIB NAMES yaml-cpp)