This is an automated email from the ASF dual-hosted git repository.
cmcfarlen 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 87accee634 Honor BUILD_SHARED_LIBS for tscore. (#10588)
87accee634 is described below
commit 87accee634fe2f90e91064b841a522b0b38fb55b
Author: Chris McFarlen <[email protected]>
AuthorDate: Thu Oct 12 16:42:57 2023 -0500
Honor BUILD_SHARED_LIBS for tscore. (#10588)
Co-authored-by: Chris McFarlen <[email protected]>
---
plugins/esi/common/CMakeLists.txt | 2 +-
plugins/esi/fetcher/CMakeLists.txt | 2 +-
plugins/esi/lib/CMakeLists.txt | 2 +-
plugins/esi/test/CMakeLists.txt | 2 +-
src/tscore/CMakeLists.txt | 4 +++-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/plugins/esi/common/CMakeLists.txt
b/plugins/esi/common/CMakeLists.txt
index 7e702736d8..771112335f 100644
--- a/plugins/esi/common/CMakeLists.txt
+++ b/plugins/esi/common/CMakeLists.txt
@@ -15,7 +15,7 @@
#
#######################
-add_library(esi-common DocNode.cc gzip.cc Utils.cc)
+add_library(esi-common STATIC DocNode.cc gzip.cc Utils.cc)
target_link_libraries(esi-common PRIVATE ZLIB::ZLIB libswoc)
target_include_directories(esi-common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
set_target_properties(esi-common PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/plugins/esi/fetcher/CMakeLists.txt
b/plugins/esi/fetcher/CMakeLists.txt
index b65c681537..24f779e1d3 100644
--- a/plugins/esi/fetcher/CMakeLists.txt
+++ b/plugins/esi/fetcher/CMakeLists.txt
@@ -15,7 +15,7 @@
#
#######################
-add_library(fetcher HttpDataFetcherImpl.cc)
+add_library(fetcher STATIC HttpDataFetcherImpl.cc)
target_link_libraries(fetcher PUBLIC esi-common)
target_include_directories(fetcher PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
set_target_properties(fetcher PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/plugins/esi/lib/CMakeLists.txt b/plugins/esi/lib/CMakeLists.txt
index fb79365e51..544b00692e 100644
--- a/plugins/esi/lib/CMakeLists.txt
+++ b/plugins/esi/lib/CMakeLists.txt
@@ -15,7 +15,7 @@
#
#######################
-add_library(esicore
+add_library(esicore STATIC
EsiGunzip.cc
EsiGzip.cc
EsiParser.cc
diff --git a/plugins/esi/test/CMakeLists.txt b/plugins/esi/test/CMakeLists.txt
index 3f4875a233..3b92cec414 100644
--- a/plugins/esi/test/CMakeLists.txt
+++ b/plugins/esi/test/CMakeLists.txt
@@ -15,7 +15,7 @@
#
#######################
-add_library(esitest
+add_library(esitest STATIC
HandlerMap.cc
StubIncludeHandler.cc
TestHandlerManager.cc
diff --git a/src/tscore/CMakeLists.txt b/src/tscore/CMakeLists.txt
index 1d48196dd3..63dba24821 100644
--- a/src/tscore/CMakeLists.txt
+++ b/src/tscore/CMakeLists.txt
@@ -29,7 +29,7 @@ add_custom_command(
add_custom_target(ParseRules ALL DEPENDS ParseRulesCType
ParseRulesCTypeToUpper ParseRulesCTypeToLower)
-add_library(tscore STATIC
+add_library(tscore
AcidPtr.cc
AcidPtr.cc
Arena.cc
@@ -119,6 +119,8 @@ target_link_libraries(tscore
PCRE::PCRE
libswoc
yaml-cpp::yaml-cpp
+ PRIVATE
+ resolv
)
if(TS_USE_POSIX_CAP)