$NetBSD: patch-src_CMakeLists.txt,v 1.1 2022/11/14 18:44:06 adam Exp $ Fix build. --- src/CMakeLists.txt.orig 2024-09-17 11:26:36.000000000 +0000 +++ src/CMakeLists.txt @@ -57,6 +57,7 @@ if (MSVC_IDE OR XCODE) endif() # Some files depend on libc++ internals. +include_directories("${LIBCXXABI_LIBCXX_PATH}/include") include_directories("${LIBCXXABI_LIBCXX_PATH}/src") if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL) @@ -166,7 +167,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER) target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared) endif() endif() -target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_LIBRARIES}) if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG) target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY}) endif() @@ -253,7 +253,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBC target_link_libraries(cxxabi_static_objects PUBLIC unwind_static_objects) # propagate usage requirements target_sources(cxxabi_static_objects PUBLIC $) endif() -target_link_libraries(cxxabi_static_objects PRIVATE cxx-headers ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES}) target_link_libraries(cxxabi_static_objects PUBLIC cxxabi-headers) set_target_properties(cxxabi_static_objects PROPERTIES @@ -306,7 +305,6 @@ endif() # Add a meta-target for both libraries. add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS}) -add_dependencies(cxxabi-test-depends cxxabi cxx) if (LIBCXXABI_INSTALL_LIBRARY) install(TARGETS ${LIBCXXABI_INSTALL_TARGETS}