1 files changed, 132 insertions, 0 deletions
diff --git a/vcpkg/ports/dbus-cxx/use-cmakeconfig.patch b/vcpkg/ports/dbus-cxx/use-cmakeconfig.patch
new file mode 100644
index 0000000..c8a139f
--- /dev/null
+++ b/vcpkg/ports/dbus-cxx/use-cmakeconfig.patch
@@ -0,0 +1,132 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0030f17..0e19089 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,6 @@ include( CTest )
+ include( CheckCXXSymbolExists )
+ include( CheckCXXCompilerFlag )
+ IF( CMAKE_BUILD_TYPE MATCHES Debug )
+-include( CodeCoverage )
+ ENDIF( CMAKE_BUILD_TYPE MATCHES Debug )
+ 
+ find_package(PkgConfig REQUIRED)
+@@ -36,7 +35,8 @@ set( DBUS_CXX_INCLUDE_VERSION 2.0 )
+ set( PKG_VERSION ${dbus-cxx_VERSION} )
+ 
+ # Our required dependencies: libsigc++ 3.0
+-pkg_check_modules( sigc REQUIRED IMPORTED_TARGET sigc++-3.0 )
++find_package(sigc++-3 CONFIG REQUIRED)
++add_library(PkgConfig::sigc ALIAS sigc-3.0)
+ 
+ #
+ # Check our options
+@@ -355,18 +355,26 @@ INSTALL( FILES "${PROJECT_BINARY_DIR}/dbus-cxx-2.0.pc"
+ # Support for find_package
+ #
+ install(EXPORT dbus-cxxTargets
+-  FILE        dbus-cxxConfig.cmake
+-  NAMESPACE     dbus-cxx::
++  FILE        dbus-cxxTargets.cmake
++  NAMESPACE   dbus-cxx::
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dbus-cxx
+ )
+ 
+ include(CMakePackageConfigHelpers)
+-write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/dbus-cxxConfigVersion.cmake"
++write_basic_package_version_file(
++  "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxxConfigVersion.cmake"
+   VERSION       ${PROJECT_VERSION}
+   COMPATIBILITY SameMajorVersion
+ )
+-install(FILES   "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxxConfigVersion.cmake"
+-  DESTINATION   ${CMAKE_INSTALL_LIBDIR}/cmake/dbus-cxx
++configure_package_config_file(
++  "${PROJECT_SOURCE_DIR}/cmake/dbus-cxxConfig.cmake.in"
++  "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxxConfig.cmake"
++  INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/dbus-cxx"
++)
++install(FILES
++  "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxxConfig.cmake"
++  "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxxConfigVersion.cmake"
++  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/dbus-cxx"
+ )
+ 
+ #
+diff --git a/dbus-cxx-glib/CMakeLists.txt b/dbus-cxx-glib/CMakeLists.txt
+index 6b98f27..87c245c 100644
+--- a/dbus-cxx-glib/CMakeLists.txt
++++ b/dbus-cxx-glib/CMakeLists.txt
+@@ -67,6 +67,6 @@ INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxx-glib-2.0.pc"
+ install( TARGETS dbus-cxx-glib
+     EXPORT dbus-cxxTargets
+     COMPONENT glib
+-    PUBLIC_HEADER DESTINATION include/dbus-cxx-glib-${DBUS_CXX_INCLUDE_VERSION}
+-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" )
++    PUBLIC_HEADER DESTINATION include/dbus-cxx-glib-${DBUS_CXX_INCLUDE_VERSION} COMPONENT glib
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT glib
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT glib)
+diff --git a/dbus-cxx-qt/CMakeLists.txt b/dbus-cxx-qt/CMakeLists.txt
+index 9c637ed..a7b75ca 100644
+--- a/dbus-cxx-qt/CMakeLists.txt
++++ b/dbus-cxx-qt/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_AUTORCC ON)
+ set(CMAKE_AUTOUIC ON)
+ 
+-find_package(Qt5 COMPONENTS Core REQUIRED)
++find_package(Qt6 COMPONENTS Core REQUIRED)
+ 
+ set( dbus-cxx-qt-headers dbus-cxx-qt.h qtthreaddispatcher.h qtdispatcher.h )
+ set( dbus-cxx-qt-sources dbus-cxx-qt.cpp qtthreaddispatcher.cpp qtdispatcher.cpp )
+@@ -28,7 +28,7 @@ set_target_properties( dbus-cxx-qt PROPERTIES
+     VERSION 2.0.0 SOVERSION 2
+     PUBLIC_HEADER "${dbus-cxx-qt-headers}"
+ )
+-target_link_libraries( dbus-cxx-qt PUBLIC Qt5::Core dbus-cxx PkgConfig::sigc ${LIBRT} )
++target_link_libraries( dbus-cxx-qt PUBLIC Qt6::Core dbus-cxx PkgConfig::sigc ${LIBRT} )
+ target_include_directories( dbus-cxx-qt INTERFACE
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+     $<INSTALL_INTERFACE:include/dbus-cxx-qt-${DBUS_CXX_INCLUDE_VERSION}>
+@@ -73,6 +73,6 @@ INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxx-qt-2.0.pc"
+ install( TARGETS dbus-cxx-qt
+     EXPORT dbus-cxxTargets
+     COMPONENT qt
+-    PUBLIC_HEADER DESTINATION include/dbus-cxx-qt-${DBUS_CXX_INCLUDE_VERSION}
+-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" )
++    PUBLIC_HEADER DESTINATION include/dbus-cxx-qt-${DBUS_CXX_INCLUDE_VERSION} COMPONENT qt
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT qt
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT qt)
+diff --git a/dbus-cxx-uv/CMakeLists.txt b/dbus-cxx-uv/CMakeLists.txt
+index 23d51c5..a1e3abb 100644
+--- a/dbus-cxx-uv/CMakeLists.txt
++++ b/dbus-cxx-uv/CMakeLists.txt
+@@ -18,7 +18,7 @@ else()
+   set( LIBUV_PKG_NAME libuv )
+ endif()
+ 
+-pkg_check_modules( libuv REQUIRED IMPORTED_TARGET ${LIBUV_PKG_NAME} )
++find_package(libuv CONFIG REQUIRED)
+ 
+ set( dbus-cxx-uv-headers dbus-cxx-uv.h uvdispatcher.h )
+ set( dbus-cxx-uv-sources dbus-cxx-uv.cpp uvdispatcher.cpp )
+@@ -33,7 +33,7 @@ target_include_directories( dbus-cxx-uv INTERFACE
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+     $<INSTALL_INTERFACE:include/dbus-cxx-uv-${DBUS_CXX_INCLUDE_VERSION}>
+ )
+-target_link_libraries( dbus-cxx-uv PUBLIC PkgConfig::libuv )
++target_link_libraries( dbus-cxx-uv PUBLIC $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> )
+ 
+ set_property( TARGET dbus-cxx-uv PROPERTY CXX_STANDARD 17 )
+ 
+@@ -74,6 +74,6 @@ INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/dbus-cxx-uv-2.0.pc"
+ install( TARGETS dbus-cxx-uv
+     EXPORT dbus-cxxTargets
+     COMPONENT uv
+-    PUBLIC_HEADER DESTINATION include/dbus-cxx-uv-${DBUS_CXX_INCLUDE_VERSION}
+-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" )
++    PUBLIC_HEADER DESTINATION include/dbus-cxx-uv-${DBUS_CXX_INCLUDE_VERSION} COMPONENT uv
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT uv
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT uv)