File tree Expand file tree Collapse file tree 2 files changed +14
-5
lines changed
Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -231,6 +231,15 @@ endif()
231231if (NOT CMAKE_EXE_LINKER_FLAGS OR NOT DEFINED CMAKE_EXE_LINKER_FLAGS )
232232 set (CMAKE_EXE_LINKER_FLAGS "$ENV{LDFLAGS} " )
233233endif ()
234+
235+ # Detect libc++ linker mismatch (e.g. Homebrew LLVM headers vs system libc++)
236+ include (CheckCXXFeatures )
237+ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
238+ vgkit_check_libcxx_linker_mismatch (MODIFY_GLOBAL_FLAGS )
239+ else ()
240+ vgkit_check_libcxx_linker_mismatch ()
241+ endif ()
242+
234243if (NOT CMAKE_CXX_COMPILER )
235244 message (FATAL_ERROR "C++ compiler not found" )
236245endif ()
Original file line number Diff line number Diff line change 11# for each dependency track both current and previous id (the variable for the latter must contain PREVIOUS)
22# to be able to auto-update them
33
4- set (TA_TRACKED_VGCMAKEKIT_TAG 4c949fd7ccfe4b4f0e103288a5c0f557c6e740c0 )
4+ set (TA_TRACKED_VGCMAKEKIT_TAG 256d9462bb765787f5acb69be154b26d6efba8b6 )
55
66# N.B. may need to update INSTALL.md manually with the CUDA-specific version
77set (TA_TRACKED_EIGEN_VERSION 3.3.5)
@@ -17,14 +17,14 @@ set(TA_TRACKED_MADNESS_PREVIOUS_TAG bd84a52766ab497dedc2f15f2162fb0eb7ec4653)
1717set (TA_TRACKED_MADNESS_VERSION 0.10.1)
1818set (TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)
1919
20- set (TA_TRACKED_BTAS_TAG 62d57d9b1e0c733b4b547bc9cfdd07047159dbca )
21- set (TA_TRACKED_BTAS_PREVIOUS_TAG 1cfcb12647c768ccd83b098c64cda723e1275e49 )
20+ set (TA_TRACKED_BTAS_TAG 287b145ead818a0332f2b7ce0b7375a83d328bae )
21+ set (TA_TRACKED_BTAS_PREVIOUS_TAG 62d57d9b1e0c733b4b547bc9cfdd07047159dbca )
2222
2323set (TA_TRACKED_LIBRETT_TAG 6eed30d4dd2a5aa58840fe895dcffd80be7fbece)
2424set (TA_TRACKED_LIBRETT_PREVIOUS_TAG 354e0ccee54aeb2f191c3ce2c617ebf437e49d83)
2525
26- set (TA_TRACKED_UMPIRE-CXX-ALLOCATOR_TAG cbb08408b1cfbbacc24992e36f52edb3a29bdedc )
27- set (TA_TRACKED_UMPIRE-CXX-ALLOCATOR_PREVIOUS_TAG a48ad360e20b9733263768b54aa24afe5894faa4 )
26+ set (TA_TRACKED_UMPIRE-CXX-ALLOCATOR_TAG 0f8144f19897766d0f117f7353221d4e3b8b1178 )
27+ set (TA_TRACKED_UMPIRE-CXX-ALLOCATOR_PREVIOUS_TAG cbb08408b1cfbbacc24992e36f52edb3a29bdedc )
2828
2929set (TA_TRACKED_SCALAPACKPP_TAG 6397f52cf11c0dfd82a79698ee198a2fce515d81)
3030set (TA_TRACKED_SCALAPACKPP_PREVIOUS_TAG 711ef363479a90c88788036f9c6c8adb70736cbf )
You can’t perform that action at this time.
0 commit comments