From 00e44369cb23f911821ee96888cbb4785810ba07 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 1 Aug 2020 01:49:53 +0200 Subject: [tomlplusplus] Add new port (#10786) * vcpkg_fixup_cmake_targets: Add support for processing cmake config files generated by meson In particular this adds a workaround for the differences between CMake and meson described in https://github.com/mesonbuild/meson/issues/6955 * Add tomlplusplus * Resolve conflicts * Update scripts/ci.baseline.txt * [tomplusplus] Update ci.basline.txt Co-authored-by: Billy Robert O'Neal III Co-authored-by: wangli28 Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index ad2077b4d..0be2dfc54 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -169,6 +169,10 @@ function(vcpkg_fixup_cmake_targets) "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\./(\\.\\./)*\" ABSOLUTE\\)" "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" _contents "${_contents}") + string(REGEX REPLACE + "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\.((\\\\|/)\\.\\.)*\" ABSOLUTE\\)" + "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" + _contents "${_contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 #Fix wrongly absolute paths to install dir with the correct dir using ${_IMPORT_PREFIX} string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${_IMPORT_PREFIX}]] _contents "${_contents}") file(WRITE ${MAIN_CMAKE} "${_contents}") -- cgit v1.2.3