<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6d786587f8c62b1179650d1f7dca62c170027226">https://github.com/macports/macports-ports/commit/6d786587f8c62b1179650d1f7dca62c170027226</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6d786587f8c yaml-cpp: fix CMake export files (#14468)
</span>6d786587f8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d786587f8c62b1179650d1f7dca62c170027226
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Tue Apr 5 11:12:19 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> yaml-cpp: fix CMake export files (#14468)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/jbeder/yaml-cpp/commit/4aad2b1666a4742743b04e765a34742512915674
</span>---
devel/yaml-cpp/Portfile | 4 +-
devel/yaml-cpp/files/patch-CMakeLists.txt.diff | 110 +++++++++++++++++++++++++
2 files changed, 113 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/yaml-cpp/Portfile b/devel/yaml-cpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6bf2c240e4..735275850f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/yaml-cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/yaml-cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
github.setup jbeder yaml-cpp 0.7.0 yaml-cpp-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories devel
maintainers {judaew @judaew} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +18,8 @@ checksums rmd160 d574a07e1e12a590dc85e74ee58910c410c31313 \
</span> sha256 2a5ed8e606edce269b5ffaed3f224ba7e4c46ee9163313ac103dc62a56330ff7 \
size 1033398
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
configure.args -DYAML_BUILD_SHARED_LIBS=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/yaml-cpp/files/patch-CMakeLists.txt.diff b/devel/yaml-cpp/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1306c1f8a19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/yaml-cpp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,110 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4aad2b1666a4742743b04e765a34742512915674 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Felix Schwitzer <flx107809@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 1 Apr 2022 05:26:47 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix CMake export files (#1077)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+empty variables. (see also the discussion in #774).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Rework this file and the call to `configure_package_config_file` according the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to overcome this issue and allow a simple `find_package` after install.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As there was some discussion about the place where to install the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+an extra variable to make it easier changing this location in the future.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also untabify CMakeLists.txt in some places to align with the other code parts in this file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 29 ++++++++++++++++++-----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yaml-cpp-config.cmake.in | 10 ++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 24 insertions(+), 15 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 564b7c8d1..ccc1964ea 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,10 +133,16 @@ set_target_properties(yaml-cpp PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# FIXME(felix2012): A more common place for the cmake export would be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(EXPORT_TARGETS yaml-cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_package_config_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unset(EXPORT_TARGETS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_basic_package_version_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,30 +151,31 @@ write_basic_package_version_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (YAML_CPP_INSTALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS yaml-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(TARGETS yaml-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT yaml-cpp-targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILES_MATCHING PATTERN "*.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILES_MATCHING PATTERN "*.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(EXPORT yaml-cpp-targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${CONFIG_EXPORT_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${CONFIG_EXPORT_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unset(CONFIG_EXPORT_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(YAML_CPP_BUILD_TESTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_subdirectory(test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_subdirectory(test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(YAML_CPP_BUILD_TOOLS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_subdirectory(util)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_subdirectory(util)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (YAML_CPP_CLANG_FORMAT_EXE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git yaml-cpp-config.cmake.in yaml-cpp-config.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7b41e3f30..a7ace3dc0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- yaml-cpp-config.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ yaml-cpp-config.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,12 +3,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # YAML_CPP_INCLUDE_DIR - include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # YAML_CPP_LIBRARIES - libraries to link against
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Compute paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@PACKAGE_INIT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Our library dependencies (contains definitions for IMPORTED targets)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These are IMPORTED targets created by yaml-cpp-targets.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++check_required_components(@EXPORT_TARGETS@)
</span></pre><pre style='margin:0'>
</pre>