This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new b70e3d1ac8 Run cmake-format on .cmake files (#10764)
b70e3d1ac8 is described below
commit b70e3d1ac8c3723a37f1c1beba12e4f6ee3a0364
Author: Brian Neradt <[email protected]>
AuthorDate: Mon Nov 13 11:02:27 2023 -0600
Run cmake-format on .cmake files (#10764)
I updated our format scripts earlier to run cmake-format on
CMakeLists.txt files, but forgot to add in our .cmake files. This
fixes that oversight.
---
cmake/Check128BitCas.cmake | 14 ++++-----
cmake/CheckOpenSSLIsBoringSSL.cmake | 12 ++++----
cmake/ConfigureTransparentProxy.cmake | 44 ++++++++++++++--------------
cmake/FindLuaJIT.cmake | 14 ++++-----
cmake/FindPCRE.cmake | 17 +++++------
cmake/Findbrotli.cmake | 34 ++++++----------------
cmake/Findcap.cmake | 12 ++++----
cmake/Findcjose.cmake | 12 ++++----
cmake/Findhwloc.cmake | 12 ++++----
cmake/Findjansson.cmake | 12 ++++----
cmake/Findjemalloc.cmake | 18 ++++++------
cmake/Findmaxminddb.cmake | 12 ++++----
cmake/Findprofiler.cmake | 18 ++++++------
cmake/Findquiche.cmake | 18 ++++++------
cmake/Findresolv.cmake | 4 +--
cmake/Findunwind.cmake | 12 ++++----
cmake/install_configs.cmake | 3 +-
cmake/layout.cmake | 13 ++++-----
cmake/post_install.cmake | 4 +--
cmake/proxy-verifier.cmake | 54 +++++++++++++++++------------------
cmake/subproject_version.cmake | 31 +++++++++++---------
tools/cmake-format.sh | 4 +--
tools/git/pre-commit | 2 +-
23 files changed, 170 insertions(+), 206 deletions(-)
diff --git a/cmake/Check128BitCas.cmake b/cmake/Check128BitCas.cmake
index e743607ad7..850bc398fe 100644
--- a/cmake/Check128BitCas.cmake
+++ b/cmake/Check128BitCas.cmake
@@ -37,18 +37,16 @@ include(CheckCSourceCompiles)
check_c_source_compiles("${CHECK_PROGRAM}" TS_HAS_128BIT_CAS)
if(NOT TS_HAS_128BIT_CAS)
- unset(TS_HAS_128BIT_CAS CACHE)
- set(CMAKE_REQUIRED_FLAGS "-Werror -mcx16")
- check_c_source_compiles("${CHECK_PROGRAM}" TS_HAS_128BIT_CAS)
- set(NEED_MCX16 ${TS_HAS_128BIT_CAS})
- unset(CMAKE_REQUIRED_FLAGS)
+ unset(TS_HAS_128BIT_CAS CACHE)
+ set(CMAKE_REQUIRED_FLAGS "-Werror -mcx16")
+ check_c_source_compiles("${CHECK_PROGRAM}" TS_HAS_128BIT_CAS)
+ set(NEED_MCX16 ${TS_HAS_128BIT_CAS})
+ unset(CMAKE_REQUIRED_FLAGS)
endif()
set(TS_NEEDS_MCX16_FOR_CAS
${NEED_MCX16}
- CACHE
- BOOL
- "Whether -mcx16 is needed to compile CAS"
+ CACHE BOOL "Whether -mcx16 is needed to compile CAS"
)
unset(CHECK_PROGRAM)
diff --git a/cmake/CheckOpenSSLIsBoringSSL.cmake
b/cmake/CheckOpenSSLIsBoringSSL.cmake
index 8d12c4702d..a779c487a1 100644
--- a/cmake/CheckOpenSSLIsBoringSSL.cmake
+++ b/cmake/CheckOpenSSLIsBoringSSL.cmake
@@ -16,8 +16,8 @@
#######################
function(CHECK_OPENSSL_IS_BORINGSSL OUT_VAR OPENSSL_INCLUDE_DIR)
- set(CHECK_PROGRAM
- "
+ set(CHECK_PROGRAM
+ "
#include <openssl/base.h>
#ifndef OPENSSL_IS_BORINGSSL
@@ -28,8 +28,8 @@ function(CHECK_OPENSSL_IS_BORINGSSL OUT_VAR
OPENSSL_INCLUDE_DIR)
return 0;
}
"
- )
- set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
- include(CheckCXXSourceCompiles)
- check_cxx_source_compiles("${CHECK_PROGRAM}" ${OUT_VAR})
+ )
+ set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+ include(CheckCXXSourceCompiles)
+ check_cxx_source_compiles("${CHECK_PROGRAM}" ${OUT_VAR})
endfunction()
diff --git a/cmake/ConfigureTransparentProxy.cmake
b/cmake/ConfigureTransparentProxy.cmake
index e4e947e591..18cb78f9aa 100644
--- a/cmake/ConfigureTransparentProxy.cmake
+++ b/cmake/ConfigureTransparentProxy.cmake
@@ -31,29 +31,29 @@
set(TS_IP_TRANSPARENT 0)
if(ENABLE_TPROXY STREQUAL "NO")
- set(TS_USE_TPROXY FALSE)
- return()
+ set(TS_USE_TPROXY FALSE)
+ return()
endif()
if(NOT TS_USE_POSIX_CAP)
- if(ENABLE_TPROXY STREQUAL "AUTO")
- set(TS_USE_TPROXY FALSE)
- else()
- message(FATAL_ERROR "ENABLE_TPROXY requires POSIX capabilities.")
- endif()
- return()
+ if(ENABLE_TPROXY STREQUAL "AUTO")
+ set(TS_USE_TPROXY FALSE)
+ else()
+ message(FATAL_ERROR "ENABLE_TPROXY requires POSIX capabilities.")
+ endif()
+ return()
endif()
if(ENABLE_TPROXY STREQUAL "FORCE")
- set(TS_USE_TPROXY TRUE)
- set(TS_IP_TRANSPARENT 19)
- return()
+ set(TS_USE_TPROXY TRUE)
+ set(TS_IP_TRANSPARENT 19)
+ return()
endif()
if(ENABLE_TPROXY MATCHES "([0-9]+)")
- set(TS_USE_TPROXY TRUE)
- set(TS_IP_TRANSPARENT ${CMAKE_MATCH_1})
- return()
+ set(TS_USE_TPROXY TRUE)
+ set(TS_IP_TRANSPARENT ${CMAKE_MATCH_1})
+ return()
endif()
# If the read fails, it will print out a confusing error. This
@@ -61,16 +61,14 @@ endif()
message(STATUS "ENABLE_TPROXY enabled, looking for value in
/usr/include/linux/in.h")
file(READ "/usr/include/linux/in.h" HEADER_CONTENTS)
if(HEADER_CONTENTS MATCHES "#define[ \t]+IP_TRANSPARENT[ \t]+([0-9]+)")
- set(TS_USE_TPROXY TRUE)
- set(TS_IP_TRANSPARENT ${CMAKE_MATCH_1})
+ set(TS_USE_TPROXY TRUE)
+ set(TS_IP_TRANSPARENT ${CMAKE_MATCH_1})
else()
- if(ENABLE_TPROXY STREQUAL "AUTO")
- set(TS_USE_TPROXY FALSE)
- else()
- message(FATAL_ERROR
- "ENABLE_TPROXY on but IP_TRANSPARENT symbol not found"
- )
- endif()
+ if(ENABLE_TPROXY STREQUAL "AUTO")
+ set(TS_USE_TPROXY FALSE)
+ else()
+ message(FATAL_ERROR "ENABLE_TPROXY on but IP_TRANSPARENT symbol not found")
+ endif()
endif()
unset(HEADER_CONTENTS)
diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake
index 5bb3410a84..23088f6729 100644
--- a/cmake/FindLuaJIT.cmake
+++ b/cmake/FindLuaJIT.cmake
@@ -33,17 +33,15 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(LuaJIT luajit)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LuaJIT
- REQUIRED_VARS LuaJIT_LIBRARIES LuaJIT_INCLUDE_DIRS
-)
+find_package_handle_standard_args(LuaJIT REQUIRED_VARS LuaJIT_LIBRARIES
LuaJIT_INCLUDE_DIRS)
if(LuaJIT_FOUND)
- set(LuaJIT_INCLUDE_DIRS ${LuaJIT_INCLUDE_DIR})
+ set(LuaJIT_INCLUDE_DIRS ${LuaJIT_INCLUDE_DIR})
endif()
if(LuaJIT_FOUND AND NOT TARGET LuaJIT::LuaJIT)
- add_library(LuaJIT::LuaJIT INTERFACE IMPORTED)
- target_include_directories(LuaJIT::LuaJIT INTERFACE ${LuaJIT_INCLUDE_DIRS})
- target_link_directories(LuaJIT::LuaJIT INTERFACE ${LuaJIT_LIBRARY_DIRS})
- target_link_libraries(LuaJIT::LuaJIT INTERFACE ${LuaJIT_LIBRARIES})
+ add_library(LuaJIT::LuaJIT INTERFACE IMPORTED)
+ target_include_directories(LuaJIT::LuaJIT INTERFACE ${LuaJIT_INCLUDE_DIRS})
+ target_link_directories(LuaJIT::LuaJIT INTERFACE ${LuaJIT_LIBRARY_DIRS})
+ target_link_libraries(LuaJIT::LuaJIT INTERFACE ${LuaJIT_LIBRARIES})
endif()
diff --git a/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake
index dfd90beb31..627e1c990b 100644
--- a/cmake/FindPCRE.cmake
+++ b/cmake/FindPCRE.cmake
@@ -28,24 +28,21 @@
# PCRE::PCRE
#
-
-find_path(PCRE_INCLUDE_DIR NAMES pcre.h)# PATH_SUFFIXES pcre)
+find_path(PCRE_INCLUDE_DIR NAMES pcre.h) # PATH_SUFFIXES pcre)
find_library(PCRE_LIBRARY NAMES pcre)
mark_as_advanced(PCRE_FOUND PCRE_LIBRARY PCRE_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PCRE
- REQUIRED_VARS PCRE_INCLUDE_DIR PCRE_LIBRARY
-)
+find_package_handle_standard_args(PCRE REQUIRED_VARS PCRE_INCLUDE_DIR
PCRE_LIBRARY)
if(PCRE_FOUND)
- set(PCRE_INCLUDE_DIRS "${PCRE_INCLUDE_DIR}")
- set(PCRE_LIBRARIES "${PCRE_LIBRARY}")
+ set(PCRE_INCLUDE_DIRS "${PCRE_INCLUDE_DIR}")
+ set(PCRE_LIBRARIES "${PCRE_LIBRARY}")
endif()
if(PCRE_FOUND AND NOT TARGET PCRE::PCRE)
- add_library(PCRE::PCRE INTERFACE IMPORTED)
- target_include_directories(PCRE::PCRE INTERFACE ${PCRE_INCLUDE_DIRS})
- target_link_libraries(PCRE::PCRE INTERFACE "${PCRE_LIBRARY}")
+ add_library(PCRE::PCRE INTERFACE IMPORTED)
+ target_include_directories(PCRE::PCRE INTERFACE ${PCRE_INCLUDE_DIRS})
+ target_link_libraries(PCRE::PCRE INTERFACE "${PCRE_LIBRARY}")
endif()
diff --git a/cmake/Findbrotli.cmake b/cmake/Findbrotli.cmake
index 79ec1ad79b..8a2c63b4a8 100644
--- a/cmake/Findbrotli.cmake
+++ b/cmake/Findbrotli.cmake
@@ -34,39 +34,23 @@ find_library(brotlicommon_LIBRARY NAMES brotlicommon)
find_library(brotlienc_LIBRARY NAMES brotlienc)
find_path(brotli_INCLUDE_DIR NAMES brotli/encode.h)
-mark_as_advanced(
- brotli_FOUND
- brotlicommon_LIBRARY
- brotlienc_LIBRARY
- brotli_INCLUDE_DIR
-)
+mark_as_advanced(brotli_FOUND brotlicommon_LIBRARY brotlienc_LIBRARY
brotli_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(brotli
- REQUIRED_VARS brotlicommon_LIBRARY brotlienc_LIBRARY brotli_INCLUDE_DIR
-)
+find_package_handle_standard_args(brotli REQUIRED_VARS brotlicommon_LIBRARY
brotlienc_LIBRARY brotli_INCLUDE_DIR)
if(brotli_FOUND)
- set(brotli_INCLUDE_DIRS "${brotli_INCLUDE_DIR}")
+ set(brotli_INCLUDE_DIRS "${brotli_INCLUDE_DIR}")
endif()
if(brotli_FOUND AND NOT TARGET brotli::brotlicommon)
- add_library(brotli::brotlicommon INTERFACE IMPORTED)
- target_include_directories(brotli::brotlicommon
- INTERFACE
- ${brotli_INCLUDE_DIRS}
- )
- target_link_libraries(brotli::brotlicommon INTERFACE
"${brotlicommon_LIBRARY}")
+ add_library(brotli::brotlicommon INTERFACE IMPORTED)
+ target_include_directories(brotli::brotlicommon INTERFACE
${brotli_INCLUDE_DIRS})
+ target_link_libraries(brotli::brotlicommon INTERFACE
"${brotlicommon_LIBRARY}")
endif()
if(brotli_FOUND AND NOT TARGET brotli::brotlienc)
- add_library(brotli::brotlienc INTERFACE IMPORTED)
- target_include_directories(brotli::brotlienc
- INTERFACE ${brotli_INCLUDE_DIRS}
- )
- target_link_libraries(brotli::brotlienc
- INTERFACE
- brotli::brotlicommon
- "${brotlienc_LIBRARY}"
- )
+ add_library(brotli::brotlienc INTERFACE IMPORTED)
+ target_include_directories(brotli::brotlienc INTERFACE
${brotli_INCLUDE_DIRS})
+ target_link_libraries(brotli::brotlienc INTERFACE brotli::brotlicommon
"${brotlienc_LIBRARY}")
endif()
diff --git a/cmake/Findcap.cmake b/cmake/Findcap.cmake
index 9a489e8fc3..d6aa6ec901 100644
--- a/cmake/Findcap.cmake
+++ b/cmake/Findcap.cmake
@@ -34,16 +34,14 @@ find_path(cap_INCLUDE_DIR NAMES sys/capability.h)
mark_as_advanced(cap_FOUND cap_LIBRARY cap_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(cap
- REQUIRED_VARS cap_LIBRARY cap_INCLUDE_DIR
-)
+find_package_handle_standard_args(cap REQUIRED_VARS cap_LIBRARY
cap_INCLUDE_DIR)
if(cap_FOUND)
- set(cap_INCLUDE_DIRS ${cap_INCLUDE_DIR})
+ set(cap_INCLUDE_DIRS ${cap_INCLUDE_DIR})
endif()
if(cap_FOUND AND NOT TARGET cap::cap)
- add_library(cap::cap INTERFACE IMPORTED)
- target_include_directories(cap::cap INTERFACE ${cap_INCLUDE_DIRS})
- target_link_libraries(cap::cap INTERFACE ${cap_LIBRARY})
+ add_library(cap::cap INTERFACE IMPORTED)
+ target_include_directories(cap::cap INTERFACE ${cap_INCLUDE_DIRS})
+ target_link_libraries(cap::cap INTERFACE ${cap_LIBRARY})
endif()
diff --git a/cmake/Findcjose.cmake b/cmake/Findcjose.cmake
index 641eb302ee..abe56ac41b 100644
--- a/cmake/Findcjose.cmake
+++ b/cmake/Findcjose.cmake
@@ -34,16 +34,14 @@ find_path(cjose_INCLUDE_DIR NAMES cjose/cjose.h)
mark_as_advanced(cjose_FOUND cjose_LIBRARY cjose_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(cjose
- REQUIRED_VARS cjose_LIBRARY cjose_INCLUDE_DIR
-)
+find_package_handle_standard_args(cjose REQUIRED_VARS cjose_LIBRARY
cjose_INCLUDE_DIR)
if(cjose_FOUND)
- set(cjose_INCLUDE_DIRS ${cjose_INCLUDE_DIR})
+ set(cjose_INCLUDE_DIRS ${cjose_INCLUDE_DIR})
endif()
if(cjose_FOUND AND NOT TARGET cjose::cjose)
- add_library(cjose::cjose INTERFACE IMPORTED)
- target_include_directories(cjose::cjose INTERFACE ${cjose_INCLUDE_DIRS})
- target_link_libraries(cjose::cjose INTERFACE "${cjose_LIBRARY}")
+ add_library(cjose::cjose INTERFACE IMPORTED)
+ target_include_directories(cjose::cjose INTERFACE ${cjose_INCLUDE_DIRS})
+ target_link_libraries(cjose::cjose INTERFACE "${cjose_LIBRARY}")
endif()
diff --git a/cmake/Findhwloc.cmake b/cmake/Findhwloc.cmake
index 7e67dddd47..6cd8cab671 100644
--- a/cmake/Findhwloc.cmake
+++ b/cmake/Findhwloc.cmake
@@ -34,16 +34,14 @@ find_path(hwloc_INCLUDE_DIR NAMES hwloc.h)
mark_as_advanced(hwloc_FOUND hwloc_LIBRARY hwloc_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(hwloc
- REQUIRED_VARS hwloc_LIBRARY hwloc_INCLUDE_DIR
-)
+find_package_handle_standard_args(hwloc REQUIRED_VARS hwloc_LIBRARY
hwloc_INCLUDE_DIR)
if(hwloc_FOUND)
- set(hwloc_INCLUDE_DIRS ${hwloc_INCLUDE_DIR})
+ set(hwloc_INCLUDE_DIRS ${hwloc_INCLUDE_DIR})
endif()
if(hwloc_FOUND AND NOT TARGET hwloc::hwloc)
- add_library(hwloc::hwloc INTERFACE IMPORTED)
- target_include_directories(hwloc::hwloc INTERFACE ${hwloc_INCLUDE_DIRS})
- target_link_libraries(hwloc::hwloc INTERFACE ${hwloc_LIBRARY})
+ add_library(hwloc::hwloc INTERFACE IMPORTED)
+ target_include_directories(hwloc::hwloc INTERFACE ${hwloc_INCLUDE_DIRS})
+ target_link_libraries(hwloc::hwloc INTERFACE ${hwloc_LIBRARY})
endif()
diff --git a/cmake/Findjansson.cmake b/cmake/Findjansson.cmake
index ce00d4d873..444d71cc51 100644
--- a/cmake/Findjansson.cmake
+++ b/cmake/Findjansson.cmake
@@ -34,16 +34,14 @@ find_path(jansson_INCLUDE_DIR NAMES jansson.h)
mark_as_advanced(jansson_FOUND jansson_LIBRARY jansson_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(jansson
- REQUIRED_VARS jansson_LIBRARY jansson_INCLUDE_DIR
-)
+find_package_handle_standard_args(jansson REQUIRED_VARS jansson_LIBRARY
jansson_INCLUDE_DIR)
if(jansson_FOUND)
- set(jansson_INCLUDE_DIRS ${jansson_INCLUDE_DIR})
+ set(jansson_INCLUDE_DIRS ${jansson_INCLUDE_DIR})
endif()
if(jansson_FOUND AND NOT TARGET jansson::jansson)
- add_library(jansson::jansson INTERFACE IMPORTED)
- target_include_directories(jansson::jansson INTERFACE
${jansson_INCLUDE_DIRS})
- target_link_libraries(jansson::jansson INTERFACE "${jansson_LIBRARY}")
+ add_library(jansson::jansson INTERFACE IMPORTED)
+ target_include_directories(jansson::jansson INTERFACE
${jansson_INCLUDE_DIRS})
+ target_link_libraries(jansson::jansson INTERFACE "${jansson_LIBRARY}")
endif()
diff --git a/cmake/Findjemalloc.cmake b/cmake/Findjemalloc.cmake
index ec5b1f06a2..c7ccdc395c 100644
--- a/cmake/Findjemalloc.cmake
+++ b/cmake/Findjemalloc.cmake
@@ -29,21 +29,23 @@
#
find_library(jemalloc_LIBRARY NAMES jemalloc)
-find_path(jemalloc_INCLUDE_DIR NAMES jemalloc.h PATH_SUFFIXES jemalloc)
+find_path(
+ jemalloc_INCLUDE_DIR
+ NAMES jemalloc.h
+ PATH_SUFFIXES jemalloc
+)
mark_as_advanced(jemalloc_FOUND jemalloc_LIBRARY jemalloc_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(jemalloc
- REQUIRED_VARS jemalloc_LIBRARY jemalloc_INCLUDE_DIR
-)
+find_package_handle_standard_args(jemalloc REQUIRED_VARS jemalloc_LIBRARY
jemalloc_INCLUDE_DIR)
if(jemalloc_FOUND)
- set(jemalloc_INCLUDE_DIRS ${jemalloc_INCLUDE_DIR})
+ set(jemalloc_INCLUDE_DIRS ${jemalloc_INCLUDE_DIR})
endif()
if(jemalloc_FOUND AND NOT TARGET jemalloc::jemalloc)
- add_library(jemalloc::jemalloc INTERFACE IMPORTED)
- target_include_directories(jemalloc::jemalloc INTERFACE
${jemalloc_INCLUDE_DIRS})
- target_link_libraries(jemalloc::jemalloc INTERFACE ${jemalloc_LIBRARY})
+ add_library(jemalloc::jemalloc INTERFACE IMPORTED)
+ target_include_directories(jemalloc::jemalloc INTERFACE
${jemalloc_INCLUDE_DIRS})
+ target_link_libraries(jemalloc::jemalloc INTERFACE ${jemalloc_LIBRARY})
endif()
diff --git a/cmake/Findmaxminddb.cmake b/cmake/Findmaxminddb.cmake
index 041c4126e5..725cfc44ea 100644
--- a/cmake/Findmaxminddb.cmake
+++ b/cmake/Findmaxminddb.cmake
@@ -37,16 +37,14 @@ find_path(maxminddb_INCLUDE_DIR NAMES maxminddb.h)
mark_as_advanced(maxminddb_FOUND maxminddb_LIBRARY maxminddb_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(maxminddb
- REQUIRED_VARS maxminddb_LIBRARY maxminddb_INCLUDE_DIR
-)
+find_package_handle_standard_args(maxminddb REQUIRED_VARS maxminddb_LIBRARY
maxminddb_INCLUDE_DIR)
if(maxminddb_FOUND)
- set(maxminddb_INCLUDE_DIRS ${maxminddb_INCLUDE_DIR})
+ set(maxminddb_INCLUDE_DIRS ${maxminddb_INCLUDE_DIR})
endif()
if(maxminddb_FOUND AND NOT TARGET maxminddb::maxminddb)
- add_library(maxminddb::maxminddb INTERFACE IMPORTED)
- target_include_directories(maxminddb::maxminddb INTERFACE
${maxminddb_INCLUDE_DIRS})
- target_link_libraries(maxminddb::maxminddb INTERFACE
"${maxminddb_LIBRARY}")
+ add_library(maxminddb::maxminddb INTERFACE IMPORTED)
+ target_include_directories(maxminddb::maxminddb INTERFACE
${maxminddb_INCLUDE_DIRS})
+ target_link_libraries(maxminddb::maxminddb INTERFACE "${maxminddb_LIBRARY}")
endif()
diff --git a/cmake/Findprofiler.cmake b/cmake/Findprofiler.cmake
index 30e19930c0..d2e4cd4ad7 100644
--- a/cmake/Findprofiler.cmake
+++ b/cmake/Findprofiler.cmake
@@ -29,21 +29,23 @@
#
find_library(profiler_LIBRARY NAMES profiler)
-find_path(profiler_INCLUDE_DIR NAMES profiler.h PATH_SUFFIXES gperftools)
+find_path(
+ profiler_INCLUDE_DIR
+ NAMES profiler.h
+ PATH_SUFFIXES gperftools
+)
mark_as_advanced(profiler_FOUND profiler_LIBRARY profiler_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(profiler
- REQUIRED_VARS profiler_LIBRARY profiler_INCLUDE_DIR
-)
+find_package_handle_standard_args(profiler REQUIRED_VARS profiler_LIBRARY
profiler_INCLUDE_DIR)
if(profiler_FOUND)
- set(profiler_INCLUDE_DIRS ${profiler_INCLUDE_DIR})
+ set(profiler_INCLUDE_DIRS ${profiler_INCLUDE_DIR})
endif()
if(profiler_FOUND AND NOT TARGET profiler::profiler)
- add_library(gperftools::profiler INTERFACE IMPORTED)
- target_include_directories(gperftools::profiler INTERFACE
"${profiler_INCLUDE_DIRS}")
- target_link_libraries(gperftools::profiler INTERFACE "${profiler_LIBRARY}")
+ add_library(gperftools::profiler INTERFACE IMPORTED)
+ target_include_directories(gperftools::profiler INTERFACE
"${profiler_INCLUDE_DIRS}")
+ target_link_libraries(gperftools::profiler INTERFACE "${profiler_LIBRARY}")
endif()
diff --git a/cmake/Findquiche.cmake b/cmake/Findquiche.cmake
index 66123227bd..fcb3c61f27 100644
--- a/cmake/Findquiche.cmake
+++ b/cmake/Findquiche.cmake
@@ -29,21 +29,23 @@
#
find_library(quiche_LIBRARY NAMES quiche)
-find_path(quiche_INCLUDE_DIR NAMES quiche.h PATH_SUFFIXES)
+find_path(
+ quiche_INCLUDE_DIR
+ NAMES quiche.h
+ PATH_SUFFIXES
+)
mark_as_advanced(quiche_FOUND quiche_LIBRARY quiche_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(quiche
- REQUIRED_VARS quiche_LIBRARY quiche_INCLUDE_DIR
-)
+find_package_handle_standard_args(quiche REQUIRED_VARS quiche_LIBRARY
quiche_INCLUDE_DIR)
if(quiche_FOUND)
- set(quiche_INCLUDE_DIRS "${quiche_INCLUDE_DIR}")
+ set(quiche_INCLUDE_DIRS "${quiche_INCLUDE_DIR}")
endif()
if(quiche_FOUND AND NOT TARGET quiche::quiche)
- add_library(quiche::quiche INTERFACE IMPORTED)
- target_include_directories(quiche::quiche INTERFACE ${quiche_INCLUDE_DIRS})
- target_link_libraries(quiche::quiche INTERFACE "${quiche_LIBRARY}")
+ add_library(quiche::quiche INTERFACE IMPORTED)
+ target_include_directories(quiche::quiche INTERFACE ${quiche_INCLUDE_DIRS})
+ target_link_libraries(quiche::quiche INTERFACE "${quiche_LIBRARY}")
endif()
diff --git a/cmake/Findresolv.cmake b/cmake/Findresolv.cmake
index eefa1a89c0..b25240c335 100644
--- a/cmake/Findresolv.cmake
+++ b/cmake/Findresolv.cmake
@@ -21,9 +21,7 @@ find_path(resolv_INCLUDE_DIR resolv.h)
mark_as_advanced(resolv_FOUND resolv_LIBRARY resolv_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(resolv
- REQUIRED_VARS resolv_LIBRARY resolv_INCLUDE_DIR
-)
+find_package_handle_standard_args(resolv REQUIRED_VARS resolv_LIBRARY
resolv_INCLUDE_DIR)
# Add the library but only add libraries if resolv is found
add_library(resolv::resolv INTERFACE IMPORTED)
diff --git a/cmake/Findunwind.cmake b/cmake/Findunwind.cmake
index c21a00adc4..fd77524c6f 100644
--- a/cmake/Findunwind.cmake
+++ b/cmake/Findunwind.cmake
@@ -34,16 +34,14 @@ find_path(unwind_INCLUDE_DIR NAMES libunwind.h
libunwind/libunwind.h)
mark_as_advanced(unwind_FOUND unwind_LIBRARY unwind_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(unwind
- REQUIRED_VARS unwind_LIBRARY unwind_INCLUDE_DIR
-)
+find_package_handle_standard_args(unwind REQUIRED_VARS unwind_LIBRARY
unwind_INCLUDE_DIR)
if(unwind_FOUND)
- set(unwind_INCLUDE_DIRS ${unwind_INCLUDE_DIR})
+ set(unwind_INCLUDE_DIRS ${unwind_INCLUDE_DIR})
endif()
if(unwind_FOUND AND NOT TARGET unwind::unwind)
- add_library(unwind::unwind INTERFACE IMPORTED)
- target_include_directories(unwind::unwind INTERFACE ${unwind_INCLUDE_DIRS})
- target_link_libraries(unwind::unwind INTERFACE "${unwind_LIBRARY}")
+ add_library(unwind::unwind INTERFACE IMPORTED)
+ target_include_directories(unwind::unwind INTERFACE ${unwind_INCLUDE_DIRS})
+ target_link_libraries(unwind::unwind INTERFACE "${unwind_LIBRARY}")
endif()
diff --git a/cmake/install_configs.cmake b/cmake/install_configs.cmake
index 8b7ce0f141..c63f166340 100644
--- a/cmake/install_configs.cmake
+++ b/cmake/install_configs.cmake
@@ -20,7 +20,6 @@
# If the config file doesn't exist, the source config file is copied without
the '.default' extension
# If the config file already exists, the source config file is copied with the
'.default' extension
-
file(GLOB CONFIG_FILES ${CONFIG_SOURCE_GLOBS})
file(MAKE_DIRECTORY "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CONFIG_DEST_PATH}")
@@ -28,7 +27,7 @@ foreach(CONFIG_FILE ${CONFIG_FILES})
# remove the '.default' extension from the path
cmake_path(GET CONFIG_FILE STEM LAST_ONLY CONFIG_FILE_NAME)
set(DEST_FILE
"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CONFIG_DEST_PATH}/${CONFIG_FILE_NAME}")
- if (EXISTS ${DEST_FILE})
+ if(EXISTS ${DEST_FILE})
set(DEST_FILE "${DEST_FILE}.default")
endif()
message(STATUS "Installing config: ${DEST_FILE}")
diff --git a/cmake/layout.cmake b/cmake/layout.cmake
index 5f34c1249b..c01c5ec8f7 100644
--- a/cmake/layout.cmake
+++ b/cmake/layout.cmake
@@ -15,7 +15,6 @@
#
#######################
-
# trafficserver default layout:
set(CMAKE_INSTALL_BINDIR
"bin"
@@ -40,12 +39,12 @@ set(CMAKE_INSTALL_SYSCONFDIR
CACHE STRING "sysconfdir"
)
set(CMAKE_INSTALL_LOCALSTATEDIR
- "var"
- CACHE STRING "localstatedir"
+ "var"
+ CACHE STRING "localstatedir"
)
set(CMAKE_INSTALL_RUNSTATEDIR
- "${CMAKE_INSTALL_LOCALSTATEDIR}/trafficserver"
- CACHE STRING "runstatedir"
+ "${CMAKE_INSTALL_LOCALSTATEDIR}/trafficserver"
+ CACHE STRING "runstatedir"
)
set(CMAKE_INSTALL_DATAROOTDIR
"share"
@@ -60,11 +59,11 @@ set(CMAKE_INSTALL_DOCDIR
CACHE STRING "docdir"
)
set(CMAKE_INSTALL_LOGDIR
- "${CMAKE_INSTALL_LOCALSTATEDIR}/log/trafficserver"
+ "${CMAKE_INSTALL_LOCALSTATEDIR}/log/trafficserver"
CACHE STRING "logdir"
)
set(CMAKE_INSTALL_CACHEDIR
- "${CMAKE_INSTALL_LOCALSTATEDIR}/trafficserver"
+ "${CMAKE_INSTALL_LOCALSTATEDIR}/trafficserver"
CACHE STRING "cachedir"
)
include(GNUInstallDirs)
diff --git a/cmake/post_install.cmake b/cmake/post_install.cmake
index 4a638950a0..641e198bfb 100644
--- a/cmake/post_install.cmake
+++ b/cmake/post_install.cmake
@@ -18,9 +18,7 @@
if("$ENV{USER}" STREQUAL root)
foreach(DIR ${CHOWN_DIRS})
message(STATUS "Changing ${DIR} ownership to ${OWNER_USER}:${OWNER_GROUP}")
- execute_process(
- COMMAND chown ${OWNER_USER}:${OWNER_GROUP}
"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${DIR}"
- )
+ execute_process(COMMAND chown ${OWNER_USER}:${OWNER_GROUP}
"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${DIR}")
endforeach()
endif()
diff --git a/cmake/proxy-verifier.cmake b/cmake/proxy-verifier.cmake
index a2e4f2487c..cf584e608f 100644
--- a/cmake/proxy-verifier.cmake
+++ b/cmake/proxy-verifier.cmake
@@ -37,39 +37,37 @@ endif()
# Download proxy-verifier
set(PV_ARCHIVE ${CMAKE_BINARY_DIR}/proxy-verifier/proxy-verifier.tar.gz)
-file(DOWNLOAD
-
https://ci.trafficserver.apache.org/bintray/proxy-verifier-${PROXY_VERIFIER_VERSION}.tar.gz
- ${PV_ARCHIVE}
- EXPECTED_HASH ${PROXY_VERIFIER_HASH}
- SHOW_PROGRESS
-)
-file(ARCHIVE_EXTRACT
- INPUT ${PV_ARCHIVE}
+file(
+ DOWNLOAD
https://ci.trafficserver.apache.org/bintray/proxy-verifier-${PROXY_VERIFIER_VERSION}.tar.gz
${PV_ARCHIVE}
+ EXPECTED_HASH ${PROXY_VERIFIER_HASH}
+ SHOW_PROGRESS
)
+file(ARCHIVE_EXTRACT INPUT ${PV_ARCHIVE})
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
- CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64" OR
- CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "i686")
- set(PV_SUBDIR "linux-amd64")
- elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64" OR
- CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
- set(PV_SUBDIR "linux-arm64")
- else()
- message(FATAL_ERROR "Unknown processor ${CMAKE_HOST_SYSTEM_PROCESSOR}")
- endif()
+ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"
+ OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64"
+ OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "i686"
+ )
+ set(PV_SUBDIR "linux-amd64")
+ elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64" OR
CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+ set(PV_SUBDIR "linux-arm64")
+ else()
+ message(FATAL_ERROR "Unknown processor ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+ endif()
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
- CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64" OR
- CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "i686")
- set(PV_SUBDIR "darwin-amd64")
- elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
- set(PV_SUBDIR "darwin-arm64")
- else()
- message(FATAL_ERROR "Unknown processor ${CMAKE_HOST_SYSTEM_PROCESSOR}")
- endif()
+ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"
+ OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64"
+ OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "i686"
+ )
+ set(PV_SUBDIR "darwin-amd64")
+ elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+ set(PV_SUBDIR "darwin-arm64")
+ else()
+ message(FATAL_ERROR "Unknown processor ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+ endif()
else()
- message(FATAL_ERROR "Host ${CMAKE_HOST_SYSTEM_NAME} doesnt support running
proxy verifier")
+ message(FATAL_ERROR "Host ${CMAKE_HOST_SYSTEM_NAME} doesnt support running
proxy verifier")
endif()
set(PROXY_VERIFIER_PATH
${CMAKE_BINARY_DIR}/proxy-verifier-${PROXY_VERIFIER_VERSION}/${PV_SUBDIR})
diff --git a/cmake/subproject_version.cmake b/cmake/subproject_version.cmake
index afa3696a71..8f2283c365 100644
--- a/cmake/subproject_version.cmake
+++ b/cmake/subproject_version.cmake
@@ -19,19 +19,22 @@
#
# Extract version of a sub-project, which was previously included with
add_subdirectory().
function(subproject_version subproject_name VERSION_VAR)
- # Read CMakeLists.txt for subproject and extract project() call(s) from it.
- file(STRINGS "${${subproject_name}_SOURCE_DIR}/CMakeLists.txt"
project_calls REGEX "[ \t]*project\\(")
- # For every project() call try to extract its VERSION option
- foreach(project_call ${project_calls})
- string(REGEX MATCH "VERSION[ ]+([^ )]+)" version_param
"${project_call}")
- if(version_param)
- set(version_value "${CMAKE_MATCH_1}")
- endif()
- endforeach()
- if(version_value)
- set(${VERSION_VAR} "${version_value}" PARENT_SCOPE)
- message("INFO: ${subproject_name} version ${version_value}")
- else()
- message("WARNING: Cannot extract version for subproject
'${subproject_name}'")
+ # Read CMakeLists.txt for subproject and extract project() call(s) from it.
+ file(STRINGS "${${subproject_name}_SOURCE_DIR}/CMakeLists.txt" project_calls
REGEX "[ \t]*project\\(")
+ # For every project() call try to extract its VERSION option
+ foreach(project_call ${project_calls})
+ string(REGEX MATCH "VERSION[ ]+([^ )]+)" version_param "${project_call}")
+ if(version_param)
+ set(version_value "${CMAKE_MATCH_1}")
endif()
+ endforeach()
+ if(version_value)
+ set(${VERSION_VAR}
+ "${version_value}"
+ PARENT_SCOPE
+ )
+ message("INFO: ${subproject_name} version ${version_value}")
+ else()
+ message("WARNING: Cannot extract version for subproject
'${subproject_name}'")
+ endif()
endfunction(subproject_version)
diff --git a/tools/cmake-format.sh b/tools/cmake-format.sh
index d11ac49fd0..c662d9aa4d 100755
--- a/tools/cmake-format.sh
+++ b/tools/cmake-format.sh
@@ -58,11 +58,11 @@ function main() {
tmp_dir=$(mktemp -d -t tracked-git-files.XXXXXXXXXX)
files=${tmp_dir}/git_files.txt
files_filtered=${tmp_dir}/git_files_filtered.txt
- git ls-tree -r HEAD --name-only ${DIR} | grep CMakeLists.txt | grep -vE
"lib/(catch2|fastlz|swoc|yamlcpp)" > ${files}
+ git ls-tree -r HEAD --name-only ${DIR} | grep -E 'CMakeLists.txt|.cmake$' |
grep -vE "lib/(catch2|fastlz|swoc|yamlcpp)" > ${files}
# Add to the above any newly added staged files.
git diff --cached --name-only --diff-filter=A >> ${files}
# But probably not all the new staged files are CMakeLists.txt files:
- grep -E 'CMakeLists.txt' ${files} > ${files_filtered}
+ grep -E 'CMakeLists.txt|.cmake$' ${files} > ${files_filtered}
# Prepend the filenames with "./" to make the modified file output consistent
# with the clang-format target output.
sed -i'.bak' 's:^:\./:' ${files_filtered}
diff --git a/tools/git/pre-commit b/tools/git/pre-commit
index 076f184327..f91cf9e908 100755
--- a/tools/git/pre-commit
+++ b/tools/git/pre-commit
@@ -86,7 +86,7 @@ deactivate
# Now repeat the above for CMakeLists.txt files.
source ${CMAKE_FORMAT_VENV}/bin/activate
-git diff-index --cached --diff-filter=ACMR --name-only HEAD | grep
CMakeLists.txt | grep -vE "lib/(catch2|fastlz|swoc|yamlcpp)" | while read file;
do
+git diff-index --cached --diff-filter=ACMR --name-only HEAD | grep -E
'CMakeLists.txt|.cmake$' | grep -vE "lib/(catch2|fastlz|swoc|yamlcpp)" | while
read file; do
cmake-format "$file" | diff -u "$file" - >>"$cmake_format_patch_file"
done
deactivate
