From 02fa66741f2ca49c5c14997bfddf82002bde27df Mon Sep 17 00:00:00 2001 From: Vipul Cariappa Date: Tue, 29 Jul 2025 14:30:25 +0200 Subject: [PATCH] [InterOp] fix cmake to not put anything in install step --- .github/workflows/cppinterop-diff.yml | 2 +- interpreter/CppInterOp/CMakeLists.txt | 27 ------------------- .../CppInterOp/lib/CppInterOp/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/.github/workflows/cppinterop-diff.yml b/.github/workflows/cppinterop-diff.yml index f4051eda0a477..51854198a84fb 100644 --- a/.github/workflows/cppinterop-diff.yml +++ b/.github/workflows/cppinterop-diff.yml @@ -29,4 +29,4 @@ jobs: run: | rm -rf .git .github discord.svg - name: Compare - run: diff -ur CppInterOp/ root/interpreter/CppInterOp/ + run: diff --exclude=CMakeLists.txt -ur CppInterOp/ root/interpreter/CppInterOp/ diff --git a/interpreter/CppInterOp/CMakeLists.txt b/interpreter/CppInterOp/CMakeLists.txt index 8b2df5b4fc49f..f7cf109ee2c1d 100644 --- a/interpreter/CppInterOp/CMakeLists.txt +++ b/interpreter/CppInterOp/CMakeLists.txt @@ -403,33 +403,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppInterOp/CppInterOpConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOp/CppInterOpConfigVersion.cmake @ONLY) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOp/ - DESTINATION lib/cmake/CppInterOp - FILES_MATCHING - PATTERN "*.cmake" - ) - - -install(DIRECTORY include/ - DESTINATION include - FILES_MATCHING - PATTERN "*.def" - PATTERN "*.h" - PATTERN ".svn" EXCLUDE - ) - -install(DIRECTORY tools/ - DESTINATION include/CppInterOp/tools - FILES_MATCHING - PATTERN "*.h" -) - -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - DESTINATION include - FILES_MATCHING - PATTERN "CMakeFiles" EXCLUDE - PATTERN "*.inc" - ) add_definitions( -D_GNU_SOURCE ) diff --git a/interpreter/CppInterOp/lib/CppInterOp/CMakeLists.txt b/interpreter/CppInterOp/lib/CppInterOp/CMakeLists.txt index 142d4d5d92945..a277b2b4941b9 100644 --- a/interpreter/CppInterOp/lib/CppInterOp/CMakeLists.txt +++ b/interpreter/CppInterOp/lib/CppInterOp/CMakeLists.txt @@ -103,7 +103,7 @@ endif() clangStaticAnalyzerCore ) endif(LLVM_LINK_LLVM_DYLIB) - add_llvm_library(clangCppInterOp + add_llvm_library(clangCppInterOp BUILDTREE_ONLY DISABLE_LLVM_LINK_LLVM_DYLIB CppInterOp.cpp CXCppInterOp.cpp