From db8b4554aede40c7c0304f5c4e9963b656ec53ac Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Tue, 22 Aug 2023 22:47:25 +0900 Subject: [PATCH] vcpkg bugfix debug target export relocation (#26) silverqx/TinyORM#25 Fixes #25 --- .../ports/tinyorm-qt5/cmake/tiny_cmake_config_fixup.cmake | 4 ++-- cmake/vcpkg/ports/tinyorm/cmake/tiny_cmake_config_fixup.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/vcpkg/ports/tinyorm-qt5/cmake/tiny_cmake_config_fixup.cmake b/cmake/vcpkg/ports/tinyorm-qt5/cmake/tiny_cmake_config_fixup.cmake index 07a845213..5c3d642c4 100644 --- a/cmake/vcpkg/ports/tinyorm-qt5/cmake/tiny_cmake_config_fixup.cmake +++ b/cmake/vcpkg/ports/tinyorm-qt5/cmake/tiny_cmake_config_fixup.cmake @@ -1,12 +1,12 @@ # Merge release and debug CMake targets and configs to support multiconfig generators. # 1. Fix ${_IMPORT_PREFIX} of IMPORTED_IMPLIB_DEBUG and IMPORTED_LOCATION_DEBUG # in auto-generated debug target -# 2. Move /debug/share/cmake/TinyOrm/*[Tt]argets-debug.cmake to /share/cmake/${PORT}/ +# 2. Move /debug/share/cmake/TinyOrm/*[Tt]argets-debug.cmake to /share/cmake/${TinyOrm_ns}/ function(tiny_cmake_config_fixup) set(TinyOrm_ns TinyOrm) set(debug_cmake "${CURRENT_PACKAGES_DIR}/debug/share/cmake/${TinyOrm_ns}") - set(release_cmake "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}") + set(release_cmake "${CURRENT_PACKAGES_DIR}/share/cmake/${TinyOrm_ns}") file(GLOB debug_targets "${debug_cmake}/*[Tt]argets-debug.cmake") diff --git a/cmake/vcpkg/ports/tinyorm/cmake/tiny_cmake_config_fixup.cmake b/cmake/vcpkg/ports/tinyorm/cmake/tiny_cmake_config_fixup.cmake index 07a845213..5c3d642c4 100644 --- a/cmake/vcpkg/ports/tinyorm/cmake/tiny_cmake_config_fixup.cmake +++ b/cmake/vcpkg/ports/tinyorm/cmake/tiny_cmake_config_fixup.cmake @@ -1,12 +1,12 @@ # Merge release and debug CMake targets and configs to support multiconfig generators. # 1. Fix ${_IMPORT_PREFIX} of IMPORTED_IMPLIB_DEBUG and IMPORTED_LOCATION_DEBUG # in auto-generated debug target -# 2. Move /debug/share/cmake/TinyOrm/*[Tt]argets-debug.cmake to /share/cmake/${PORT}/ +# 2. Move /debug/share/cmake/TinyOrm/*[Tt]argets-debug.cmake to /share/cmake/${TinyOrm_ns}/ function(tiny_cmake_config_fixup) set(TinyOrm_ns TinyOrm) set(debug_cmake "${CURRENT_PACKAGES_DIR}/debug/share/cmake/${TinyOrm_ns}") - set(release_cmake "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}") + set(release_cmake "${CURRENT_PACKAGES_DIR}/share/cmake/${TinyOrm_ns}") file(GLOB debug_targets "${debug_cmake}/*[Tt]argets-debug.cmake")