Fix missing PCRE includes in CMake by linking to tscore

iocore/aio/CMakeLists.txt

@@ -21,3 +21,5 @@ add_library(ts::aio ALIAS aio)
 
 target_sources(aio PRIVATE AIO.cc Inline.cc)
 target_include_directories(aio PRIVATE ${CMAKE_SOURCE_DIR}/iocore/eventsystem ${CMAKE_SOURCE_DIR}/iocore/io_uring)
+
+target_link_libraries(aio PUBLIC ts::tscore)

iocore/cache/CMakeLists.txt

@@ -53,6 +53,8 @@ target_include_directories(inkcache PRIVATE
 )
 
 target_link_libraries(inkcache
+    PUBLIC
+        ts::tscore
     PRIVATE
         fastlz
         ZLIB::ZLIB
@@ -61,4 +63,3 @@ target_link_libraries(inkcache
 if(HAVE_LZMA_H)
     target_link_libraries(inkcache PRIVATE LibLZMA::LibLZMA)
 endif()
-

iocore/dns/CMakeLists.txt

@@ -36,3 +36,5 @@ target_include_directories(inkdns PRIVATE
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
 )
+
+target_link_libraries(inkdns PUBLIC ts::tscore)

iocore/hostdb/CMakeLists.txt

@@ -37,3 +37,5 @@ target_include_directories(inkhostdb PRIVATE
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
 )
+
+target_link_libraries(inkhostdb PUBLIC ts::tscore)

iocore/io_uring/CMakeLists.txt

@@ -31,10 +31,11 @@ include_directories(
 add_executable(test_iouring
         unit_tests/test_diskIO.cc)
 target_link_libraries(test_iouring
+    PUBLIC
+        ts::tscore
     PRIVATE
         inkuring
         libswoc
-        ts::tscore
         tscpputil
         uring
 )

iocore/net/CMakeLists.txt

@@ -97,7 +97,7 @@ if(BUILD_REGRESSION_TESTING)
     target_sources(inknet PRIVATE NetVCTest.cc)
 endif()
 
-target_link_libraries(inknet PUBLIC inkevent records)
+
 target_compile_options(inknet PUBLIC -Wno-deprecated-declarations)
 target_include_directories(inknet PUBLIC
         ${CMAKE_SOURCE_DIR}/iocore/eventsystem
@@ -117,6 +117,13 @@ target_include_directories(inknet PUBLIC
         ${YAML_INCLUDE_DIRS}
         )
 
+target_link_libraries(inknet
+    PUBLIC
+        ts::inkevent
+        ts::records
+        ts::tscore
+)
+
 # Fails to link because of circular dep with proxy (ParentSelection)
 # add_executable(test_net unit_tests/test_ProxyProtocol.cc)
 # target_link_libraries(test_net records_p inknet inkevent tscore yaml-cpp libswoc)

iocore/utils/CMakeLists.txt

@@ -31,3 +31,5 @@ target_include_directories(inkutils PRIVATE
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${CMAKE_SOURCE_DIR}/proxy/hdrs
         )
+
+target_link_libraries(inkutils PUBLIC ts::tscore)

mgmt/config/CMakeLists.txt

@@ -28,3 +28,5 @@ include_directories(
         ${CMAKE_SOURCE_DIR}/proxy/http
         ${IOCORE_INCLUDE_DIRS}
 )
+
+target_link_libraries(configmanager PUBLIC ts::tscore)

mgmt/rpc/CMakeLists.txt

@@ -33,6 +33,8 @@ add_library(jsonrpc_protocol STATIC
 )
 add_library(ts::jsonrpc_protocol ALIAS jsonrpc_protocol)
 
+target_link_libraries(jsonrpc_protocol PUBLIC ts::tscore)
+
 add_library(jsonrpc_server STATIC
         server/RPCServer.cc
         server/CommBase.cc
@@ -41,6 +43,8 @@ add_library(jsonrpc_server STATIC
 )
 add_library(ts::jsonrpc_server ALIAS jsonrpc_server)
 
+target_link_libraries(jsonrpc_server PUBLIC ts::tscore)
+
 add_library(rpcpublichandlers STATIC
         handlers/common/RecordsUtils.cc
         handlers/config/Configuration.cc
@@ -50,3 +54,5 @@ add_library(rpcpublichandlers STATIC
         handlers/plugins/Plugins.cc
 )
 add_library(ts::rpcpublichandlers ALIAS rpcpublichandlers)
+
+target_link_libraries(rpcpublichandlers PUBLIC ts::tscore)

plugins/CMakeLists.txt

@@ -22,7 +22,6 @@ function(add_atsplugin name)
   target_link_libraries(${name} PRIVATE traffic_server)
   set_target_properties(${name} PROPERTIES PREFIX "")
   set_target_properties(${name} PROPERTIES SUFFIX ".so")
-  set_target_properties(${name} PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib")
   install(TARGETS ${name} DESTINATION libexec/trafficserver)
 endfunction()
 

plugins/experimental/slice/CMakeLists.txt

@@ -32,7 +32,7 @@ add_atsplugin(slice
     util.cc
 )
 
-target_link_libraries(access_control PRIVATE PCRE::PCRE)
+target_link_libraries(slice PRIVATE ts::tscore)
 
 if(BUILD_TESTING)
     add_subdirectory(unit-tests)

plugins/s3_auth/CMakeLists.txt

@@ -19,4 +19,6 @@ project(s3_auth)
 
 add_atsplugin(s3_auth s3_auth.cc aws_auth_v4.cc)
 
+target_link_libraries(s3_auth PRIVATE ts::tscore)
+
 add_subdirectory(unit_tests)

proxy/CMakeLists.txt

@@ -58,6 +58,8 @@ target_include_directories(proxy PUBLIC
         ${CMAKE_SOURCE_DIR}/lib/yamlcpp/include
         )
 
+target_link_libraries(proxy PUBLIC ts::tscore)
+
 add_subdirectory(hdrs)
 add_subdirectory(shared)
 add_subdirectory(http)

proxy/http/CMakeLists.txt

@@ -56,6 +56,8 @@ target_include_directories(http
         ${YAMLCPP_INCLUDE_DIR}
 )
 
+target_link_libraries(http PUBLIC ts::tscore)
+
 if(TS_USE_QUIC)
     target_link_libraries(http PRIVATE ts::http3)
 endif()

proxy/http/remap/CMakeLists.txt

@@ -42,3 +42,5 @@ target_include_directories(http_remap PRIVATE
         ${CMAKE_SOURCE_DIR}/src/records
         ${YAML_INCLUDE_DIRS}
         )
+
+target_link_libraries(http_remap PUBLIC ts::tscore)

proxy/http2/CMakeLists.txt

@@ -36,3 +36,5 @@ target_include_directories(http2 PRIVATE
         ${PROXY_INCLUDE_DIRS}
         ${YAMLCPP_INCLUDE_DIR}
 )
+
+target_link_libraries(http2 PUBLIC ts::tscore)

proxy/logging/CMakeLists.txt

@@ -40,3 +40,5 @@ target_include_directories(logging PRIVATE
         ${YAML_INCLUDE_DIRS}
         ${SWOC_INCLUDE_DIR}
 )
+
+target_link_libraries(logging PUBLIC ts::tscore)

proxy/shared/CMakeLists.txt

@@ -24,3 +24,5 @@ target_include_directories(diagsconfig PRIVATE
         ${PROXY_INCLUDE_DIRS}
         ${YAMLCPP_INCLUDE_DIR}
 )
+
+target_link_libraries(diagsconfig PUBLIC ts::tscore)

src/tscore/CMakeLists.txt

@@ -115,11 +115,12 @@ else()
     target_sources(tscore PRIVATE HKDF_openssl.cc)
 endif()
 
+target_link_libraries(tscore PUBLIC PCRE::PCRE)
 if(TS_USE_POSIX_CAP)
     target_link_libraries(tscore PUBLIC cap::cap)
 endif()
 
-add_dependencies(tscore ParseRules tscpputil)
+add_dependencies(tscore ParseRules)
 target_include_directories(tscore PRIVATE
         ${CMAKE_CURRENT_BINARY_DIR}
         ${YAML_INCLUDE_DIRS}
@@ -167,7 +168,6 @@ target_link_libraries(test_tscore
         yaml-cpp::yaml-cpp
         libswoc
         ${OPENSSL_LIBRARIES}
-        PCRE::PCRE
         resolv
         tscpputil
 )

src/tscpp/api/CMakeLists.txt

@@ -45,5 +45,10 @@ add_library(ts::tscppapi ALIAS tscppapi)
 target_link_libraries(tscppapi
     PUBLIC
     libswoc
-    yaml-cpp::yaml-cpp)
+    yaml-cpp::yaml-cpp
+)
 install(TARGETS tscppapi)
+
+if(APPLE)
+  target_link_options(tscppapi PRIVATE -undefined dynamic_lookup)
+endif()

src/tscpp/util/CMakeLists.txt

@@ -25,7 +25,9 @@ add_library(ts::tscpputil ALIAS tscpputil)
 target_link_libraries(tscpputil
 	PUBLIC
 		libswoc
-		yaml-cpp::yaml-cpp)
+		yaml-cpp::yaml-cpp
+                ts::tscore
+)
 install(TARGETS tscpputil)
 
 add_executable(test_tscpputil