Skip to content

Commit 956b0fe

Browse files
committed
sync w/ ValeevGroup/kit-cmake#22 , improve support for latest Clang
1 parent 97719b7 commit 956b0fe

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,15 @@ endif()
115115
if(NOT CMAKE_EXE_LINKER_FLAGS OR NOT DEFINED CMAKE_EXE_LINKER_FLAGS)
116116
set(CMAKE_EXE_LINKER_FLAGS "$ENV{LDFLAGS}")
117117
endif()
118+
119+
# Detect libc++ linker mismatch (e.g. Homebrew LLVM headers vs system libc++)
120+
include(CheckCXXFeatures)
121+
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
122+
vgkit_check_libcxx_linker_mismatch(MODIFY_GLOBAL_FLAGS)
123+
else()
124+
vgkit_check_libcxx_linker_mismatch()
125+
endif()
126+
118127
if (NOT CMAKE_CXX_COMPILER)
119128
message(FATAL_ERROR "C++ compiler not found")
120129
endif()

external/versions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(BTAS_TRACKED_VGCMAKEKIT_TAG d5c0a6f9ff6dc97cbb5132912733e1eb1cf73f1e)
1+
set(BTAS_TRACKED_VGCMAKEKIT_TAG 256d9462bb765787f5acb69be154b26d6efba8b6)
22

33
# oldest Boost we can tolerate ... likely can use an earlier version, but:
44
# - as of oct 2023 tested with 1.71 and up only

0 commit comments

Comments
 (0)