From e2cdd0786670202516d73c8906b15f700263cc06 Mon Sep 17 00:00:00 2001 From: Todor Prokopov Date: Fri, 31 Jul 2020 21:13:45 +0300 Subject: [PATCH] [vcpkg] Fix vcpkg_fixup_cmake_targets to work correctly on MinGW (#12104) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [vcpkg] Fix vcpkg_fixup_cmake_targets to work correctly on MinGW * [akali] Bump version to test vcpkg_fixup_cmake_targets changes * Update ports/akali/CONTROL Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/akali/CONTROL | 3 ++- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL index a7acd59194..35f86f28ce 100644 --- a/ports/akali/CONTROL +++ b/ports/akali/CONTROL @@ -1,4 +1,5 @@ Source: akali Version: 1.41 +Port-Version: 1 Description: C++ Common Library. -Homepage: https://github.com/winsoft666/akali \ No newline at end of file +Homepage: https://github.com/winsoft666/akali diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index ec5ea05f57..ad2077b4d1 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -53,11 +53,7 @@ function(vcpkg_fixup_cmake_targets) set(_vfct_TARGET_PATH share/${PORT}) endif() - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(EXECUTABLE_SUFFIX "\\.exe") - else() - set(EXECUTABLE_SUFFIX) - endif() + string(REPLACE "." "\\." EXECUTABLE_SUFFIX "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") set(DEBUG_SHARE ${CURRENT_PACKAGES_DIR}/debug/${_vfct_TARGET_PATH}) set(RELEASE_SHARE ${CURRENT_PACKAGES_DIR}/${_vfct_TARGET_PATH})