From 3648d93b9888f4d91e2fc5fa61018c4310adc86f Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 30 Apr 2021 20:27:53 +0200 Subject: build: declare some CMake variables as advanced Type: make Change-Id: I780c1c81a50cb92bc89c05856efd8ef88479c0ab Signed-off-by: Damjan Marion --- src/plugins/af_xdp/CMakeLists.txt | 2 +- src/plugins/crypto_ipsecmb/CMakeLists.txt | 4 ++-- src/plugins/dpdk/CMakeLists.txt | 2 +- src/plugins/linux-cp/CMakeLists.txt | 2 +- src/plugins/quic/CMakeLists.txt | 10 +++++----- src/plugins/rdma/CMakeLists.txt | 2 +- src/plugins/tlsmbedtls/CMakeLists.txt | 2 +- src/plugins/tlspicotls/CMakeLists.txt | 8 ++++---- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/af_xdp/CMakeLists.txt b/src/plugins/af_xdp/CMakeLists.txt index a56f250646c..cbe96aa59dd 100644 --- a/src/plugins/af_xdp/CMakeLists.txt +++ b/src/plugins/af_xdp/CMakeLists.txt @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -find_path(BPF_INCLUDE_DIR NAMES bpf/xsk.h) +vpp_find_path(BPF_INCLUDE_DIR NAMES bpf/xsk.h) if (NOT BPF_INCLUDE_DIR) message(WARNING "libbpf headers not found - af_xdp plugin disabled") return() diff --git a/src/plugins/crypto_ipsecmb/CMakeLists.txt b/src/plugins/crypto_ipsecmb/CMakeLists.txt index 59bfe24e990..981a045262e 100644 --- a/src/plugins/crypto_ipsecmb/CMakeLists.txt +++ b/src/plugins/crypto_ipsecmb/CMakeLists.txt @@ -16,8 +16,8 @@ if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") return() endif() -find_path(IPSECMB_INCLUDE_DIR NAMES intel-ipsec-mb.h HINTS ${IPSECMB_INCLUDE_DIR_HINT}) -find_library(IPSECMB_LIB NAMES libIPSec_MB.a HINTS ${IPSECMB_LIB_DIR_HINT}) +vpp_find_path(IPSECMB_INCLUDE_DIR NAMES intel-ipsec-mb.h HINTS ${IPSECMB_INCLUDE_DIR_HINT}) +vpp_find_library(IPSECMB_LIB NAMES libIPSec_MB.a HINTS ${IPSECMB_LIB_DIR_HINT}) if(IPSECMB_INCLUDE_DIR AND IPSECMB_LIB) diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt index 8650841293e..386515e8eef 100644 --- a/src/plugins/dpdk/CMakeLists.txt +++ b/src/plugins/dpdk/CMakeLists.txt @@ -25,7 +25,7 @@ else() ############################################################################## # Find lib and include files ############################################################################## - find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h) + vpp_find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h) vpp_plugin_find_library(dpdk DPDK_LIB "libdpdk.a") if (NOT DPDK_INCLUDE_DIR) diff --git a/src/plugins/linux-cp/CMakeLists.txt b/src/plugins/linux-cp/CMakeLists.txt index 6b6ccb3d0b1..080f73ecce4 100644 --- a/src/plugins/linux-cp/CMakeLists.txt +++ b/src/plugins/linux-cp/CMakeLists.txt @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -find_path(LIBNL3_INCLUDE_DIR NAMES libnl3/netlink/route/link/vlan.h) +vpp_find_path(LIBNL3_INCLUDE_DIR NAMES libnl3/netlink/route/link/vlan.h) if (NOT LIBNL3_INCLUDE_DIR) message(WARNING "-- libnl3 headers not found - linux-cp plugin disabled") diff --git a/src/plugins/quic/CMakeLists.txt b/src/plugins/quic/CMakeLists.txt index 044186b3ae6..7a121e5fa48 100644 --- a/src/plugins/quic/CMakeLists.txt +++ b/src/plugins/quic/CMakeLists.txt @@ -15,11 +15,11 @@ unset(QUIC_LINK_LIBRARIES) set(EXPECTED_QUICLY_VERSION "0.1.3-vpp") -find_path(QUICLY_INCLUDE_DIR NAMES quicly.h) -find_path(PICOTLS_INCLUDE_DIR NAMES picotls.h) -find_library (QUICLY_LIBRARY NAMES "libquicly.a") -find_library (PICOTLS_CORE_LIBRARY NAMES "libpicotls-core.a") -find_library (PICOTLS_OPENSSL_LIBRARY NAMES "libpicotls-openssl.a") +vpp_find_path(QUICLY_INCLUDE_DIR NAMES quicly.h) +vpp_find_path(PICOTLS_INCLUDE_DIR NAMES picotls.h) +vpp_find_library(QUICLY_LIBRARY NAMES "libquicly.a") +vpp_find_library(PICOTLS_CORE_LIBRARY NAMES "libpicotls-core.a") +vpp_find_library(PICOTLS_OPENSSL_LIBRARY NAMES "libpicotls-openssl.a") list(APPEND QUIC_LINK_LIBRARIES ${QUICLY_LIBRARY} diff --git a/src/plugins/rdma/CMakeLists.txt b/src/plugins/rdma/CMakeLists.txt index cc104f871c1..f598ff8c701 100644 --- a/src/plugins/rdma/CMakeLists.txt +++ b/src/plugins/rdma/CMakeLists.txt @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -find_path(IBVERBS_INCLUDE_DIR NAMES infiniband/verbs.h) +vpp_find_path(IBVERBS_INCLUDE_DIR NAMES infiniband/verbs.h) if (NOT IBVERBS_INCLUDE_DIR) message(WARNING "-- rdma headers not found - rdma plugin disabled") diff --git a/src/plugins/tlsmbedtls/CMakeLists.txt b/src/plugins/tlsmbedtls/CMakeLists.txt index 96bc97df3f5..1accd7e37cb 100644 --- a/src/plugins/tlsmbedtls/CMakeLists.txt +++ b/src/plugins/tlsmbedtls/CMakeLists.txt @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -find_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/ssl.h) +vpp_find_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/ssl.h) if (NOT MBEDTLS_INCLUDE_DIR) message(WARNING "-- mbedtls headers not found - tlsmbedtls plugin disabled") diff --git a/src/plugins/tlspicotls/CMakeLists.txt b/src/plugins/tlspicotls/CMakeLists.txt index baf4c69427d..64f607117d3 100644 --- a/src/plugins/tlspicotls/CMakeLists.txt +++ b/src/plugins/tlspicotls/CMakeLists.txt @@ -8,10 +8,10 @@ include (CheckFunctionExists) set(EXPECTED_QUICLY_VERSION "0.1.3-vpp") -find_path(QUICLY_INCLUDE_DIR NAMES quicly.h) -find_path (PICOTLS_INCLUDE_DIR NAMES picotls.h) -find_library (PICOTLS_CORE_LIBRARY NAMES "libpicotls-core.a") -find_library (PICOTLS_OPENSSL_LIBRARY NAMES "libpicotls-openssl.a") +vpp_find_path(QUICLY_INCLUDE_DIR NAMES quicly.h) +vpp_find_path(PICOTLS_INCLUDE_DIR NAMES picotls.h) +vpp_find_library(PICOTLS_CORE_LIBRARY NAMES "libpicotls-core.a") +vpp_find_library(PICOTLS_OPENSSL_LIBRARY NAMES "libpicotls-openssl.a") list (APPEND PICOTLS_LINK_LIBRARIES ${PICOTLS_CORE_LIBRARY} -- cgit 1.2.3-korg