Skip to content

Commit f8c7163

Browse files
authored
Merge branch 'main' into Add-llvm-21-support
2 parents bbd2a48 + 33a3e7e commit f8c7163

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.codecov.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ codecov:
44
coverage:
55
precision: 2
66
round: down
7-
range: "70...100"
7+
range: "75...100"
88

99
status:
1010
project: yes
@@ -22,4 +22,7 @@ parsers:
2222
comment:
2323
layout: "reach, diff, flags, tree, files"
2424
behavior: default
25-
require_changes: no
25+
require_changes: no
26+
27+
github_checks:
28+
annotations: true # Deprecated but very useful

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ endif()
274274
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
275275

276276
set( CPPINTEROP_BUILT_STANDALONE 1 )
277-
endif()
278277

279-
include(AddLLVM)
280-
include(HandleLLVMOptions)
278+
include(AddLLVM)
279+
include(HandleLLVMOptions)
280+
endif()
281281

282282
set(CMAKE_INCLUDE_CURRENT_DIR ON)
283283

lib/CppInterOp/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ endif()
6969
continue()
7070
endif()
7171
foreach(transitive_lib ${transitive_libs})
72+
if(NOT TARGET ${transitive_lib})
73+
continue()
74+
endif()
7275
get_target_property(lib_type ${transitive_lib} TYPE)
7376
if("${lib_type}" STREQUAL "STATIC_LIBRARY")
7477
list(APPEND static_transitive_libs ${transitive_lib})

0 commit comments

Comments
 (0)