From d9b179fd46fc93a2f893b98eefac17a1985f423d Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 12 Nov 2020 17:31:34 -0800 Subject: [llvm] install tools in tools/llvm (#14399) * [llvm] install tools in tools/llvm * remove the giant commented out block of code * update port-version * hopefully fix the port? There are still some issues, namely that the python scripts and DLLs that are copied into `tools/llvm` are not considered to be "installed by llvm", and thus are not removed when llvm is removed * format! * apparently REGEX REPLACE fails if a thing doesn't match * fix LLVM_REMOVE_EXTENSION_REGEX on windows * actually read the cmake regex docs... * fix the name of the variable * turns out CMAKE_MATCH_1 is the one I want * need to update VERSION for new policy * stop removing debug/bin * fix faulty merge --- scripts/build_info.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/build_info.cmake b/scripts/build_info.cmake index 7470560c8..a6208016a 100644 --- a/scripts/build_info.cmake +++ b/scripts/build_info.cmake @@ -8,6 +8,9 @@ endif() if (DEFINED VCPKG_POLICY_DLLS_WITHOUT_EXPORTS) file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyDLLsWithoutExports: ${VCPKG_POLICY_DLLS_WITHOUT_EXPORTS}\n") endif() +if (DEFINED VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY) + file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyDLLsInStaticLibrary: ${VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY}\n") +endif() if (DEFINED VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES) file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyMismatchedNumberOfBinaries: ${VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES}\n") endif() -- cgit v1.2.3