You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by dr...@apache.org on 2023/11/14 20:19:55 UTC

(trafficserver) branch master updated: report yaml-cpp being used when external version is used. (#10777)

This is an automated email from the ASF dual-hosted git repository.

dragon 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 8aaf789b7e report yaml-cpp being used when external version is used. (#10777)
8aaf789b7e is described below

commit 8aaf789b7e997490b573475978e334feb98848c2
Author: dragon512 <dr...@live.com>
AuthorDate: Tue Nov 14 14:19:47 2023 -0600

    report yaml-cpp being used when external version is used. (#10777)
    
    * report yaml-cpp being used when external version is used
    
    * format fix
---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b5d55fc17..3cbf52220b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,6 +351,10 @@ set(HAVE_NCURSES_NCURSES_H ${CURSES_HAVE_NCURSES_NCURSES_H})
 if(EXTERNAL_YAML_CPP)
   message(STATUS "Looking for external yaml-cpp")
   find_package(yaml-cpp "0.8.0" REQUIRED)
+  set(YAMLCPP_LIB_VERSION yaml-cpp_VERSION)
+  find_package_message(
+    yaml-cpp "Found yaml-cpp: ${yaml-cpp_CONFIG} (found version \"${yaml-cpp_VERSION}\")" "${yaml-cpp_CONFIG}"
+  )
 endif()
 
 # curl is used in traffic_top
@@ -560,8 +564,6 @@ add_compile_options("$<$<CXX_COMPILER_ID:GNU>:-Wno-format-truncation;-Wno-string
 if(NOT EXTERNAL_YAML_CPP)
   include(subproject_version)
   subproject_version(YAML_CPP YAMLCPP_LIB_VERSION)
-else()
-  set(YAMLCPP_LIB_VERSION yaml-cpp_VERSION)
 endif()
 
 set(rel_cachedir var/trafficserver)