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 --- toolsrc/include/vcpkg/build.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index f15a2f724..773d3eeef 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -243,6 +243,7 @@ namespace vcpkg::Build EMPTY_PACKAGE, DLLS_WITHOUT_LIBS, DLLS_WITHOUT_EXPORTS, + DLLS_IN_STATIC_LIBRARY, MISMATCHED_NUMBER_OF_BINARIES, ONLY_RELEASE_CRT, EMPTY_INCLUDE_FOLDER, @@ -254,7 +255,7 @@ namespace vcpkg::Build COUNT, }; - // could be constexpr, but we want to generate this and that's not constexpr + // could be constexpr, but we want to generate this and that's not constexpr in C++14 extern const std::array ALL_POLICIES; const std::string& to_string(BuildPolicy policy); -- cgit v1.2.3