From c1ba4eacc34a814ce2f9f0b35bf055750c94f8c2 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Thu, 18 Jan 2018 20:28:56 +1100 Subject: Generalise vcpkg_fixup_cmake_targets.cmake file to correctly detect dlib debug files (#2574) --- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'scripts/cmake') diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index fead64d15..4bd4d135f 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -91,11 +91,8 @@ function(vcpkg_fixup_cmake_targets) file(REMOVE ${UNUSED_FILES}) endif() - # LLVM uses "LLVMExports-release.cmake" file(GLOB RELEASE_TARGETS - "${RELEASE_SHARE}/*[Tt]argets-release.cmake" - "${RELEASE_SHARE}/*[Cc]onfig-release.cmake" - "${RELEASE_SHARE}/*[Ee]xports-release.cmake" + "${RELEASE_SHARE}/*-release.cmake" ) foreach(RELEASE_TARGET ${RELEASE_TARGETS}) file(READ ${RELEASE_TARGET} _contents) @@ -106,9 +103,7 @@ function(vcpkg_fixup_cmake_targets) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(GLOB DEBUG_TARGETS - "${DEBUG_SHARE}/*[Tt]argets-debug.cmake" - "${DEBUG_SHARE}/*[Cc]onfig-debug.cmake" - "${DEBUG_SHARE}/*[Ee]xports-debug.cmake" + "${DEBUG_SHARE}/*-debug.cmake" ) foreach(DEBUG_TARGET ${DEBUG_TARGETS}) get_filename_component(DEBUG_TARGET_NAME ${DEBUG_TARGET} NAME) -- cgit v1.2.3