[clang] Revert "[Clang][CMake][MSVC] Install PDBs alongside executables" (PR #126934)
https://github.com/mayanez created https://github.com/llvm/llvm-project/pull/126934 Reverts llvm/llvm-project#126675 Broke the following: https://lab.llvm.org/buildbot/#/builders/107/builds/7929 >From 7bc1b9a09073b6b40ce3c12134391c5697af29cf Mon Sep 17 00:00:00 2001 From: "Miguel A. Arroyo" Date: Wed, 12 Feb 2025 08:05:36 -0800 Subject: [PATCH] Revert "[Clang][CMake][MSVC] Install PDBs alongside executables (#126675)" This reverts commit acd34d90d3acd9dd260fdb93c54f70c222e26875. --- clang/cmake/modules/AddClang.cmake | 4 1 file changed, 4 deletions(-) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake index 02f26b6d861ad..cdc8bd5cd503b 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake @@ -138,10 +138,6 @@ macro(add_clang_library name) ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -if (LLVM_ENABLE_PDB) - install(FILES $ DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name} OPTIONAL) -endif() - if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${lib} DEPENDS ${lib} ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Revert "[Clang][CMake][MSVC] Install PDBs alongside executables" (PR #126934)
https://github.com/mayanez closed https://github.com/llvm/llvm-project/pull/126934 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][CMake][MSVC] Install PDBs alongside executables (PR #126961)
https://github.com/mayanez created https://github.com/llvm/llvm-project/pull/126961 Fixes the changes introduced in https://github.com/llvm/llvm-project/pull/126675 and subsequently reverted by https://github.com/llvm/llvm-project/pull/126934 . Originally, I mistakenly put the `install` in the wrong location (should have been in the `add_clang_tool` macro) which slipped through testing. I've verified locally using the same CMake configure options. For reference: * **CMake Configure** ``` cmake -B build -S llvm -GNinja -DLLVM_ENABLE_PROJECTS="llvm;clang;lld;compiler-rt" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PDB=ON -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl ``` * **Error** ``` TARGET_PDB_FILE is allowed only for targets with linker created artifacts. ``` >From f316b100c21d3eea3d60945deef10c93ac4097e3 Mon Sep 17 00:00:00 2001 From: Miguel Arroyo Date: Wed, 12 Feb 2025 11:35:10 -0800 Subject: [PATCH] [Clang][CMake][MSVC] Install PDBs alongside executables --- clang/cmake/modules/AddClang.cmake | 4 1 file changed, 4 insertions(+) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake index cdc8bd5cd503b..4059fc3e986c7 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake @@ -186,6 +186,10 @@ macro(add_clang_tool name) RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + if (LLVM_ENABLE_PDB) +install(FILES $ DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name} OPTIONAL) + endif() + if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${name} DEPENDS ${name} ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][CMake][MSVC] Install PDBs alongside executables (PR #126675)
mayanez wrote: I have reverted the commit. It looks like I mistakenly put the `install` in the wrong location. https://github.com/llvm/llvm-project/pull/126675 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][CMake][MSVC] Install PDBs alongside executables (PR #126961)
https://github.com/mayanez updated https://github.com/llvm/llvm-project/pull/126961 >From ffb0e0cf837d78b38a4ad9ddebf8cd692682fdc5 Mon Sep 17 00:00:00 2001 From: Miguel Arroyo Date: Wed, 12 Feb 2025 11:35:10 -0800 Subject: [PATCH] [Clang][CMake][MSVC] Install PDBs alongside executables --- clang/cmake/modules/AddClang.cmake | 4 1 file changed, 4 insertions(+) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake index cdc8bd5cd503b..4059fc3e986c7 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake @@ -186,6 +186,10 @@ macro(add_clang_tool name) RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + if (LLVM_ENABLE_PDB) +install(FILES $ DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name} OPTIONAL) + endif() + if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${name} DEPENDS ${name} ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][CMake][MSVC] Install PDBs alongside executables (PR #126961)
https://github.com/mayanez closed https://github.com/llvm/llvm-project/pull/126961 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits