From 13d4c1e87aabdf68d5680287334f445f07c1b260 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sat, 1 Feb 2025 00:50:40 +0500 Subject: [PATCH 01/14] begin --- ports/eipscanner/portfile.cmake | 21 +++++++++++++++++++++ ports/eipscanner/usage | 4 ++++ ports/eipscanner/vcpkg.json | 17 +++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 ports/eipscanner/portfile.cmake create mode 100644 ports/eipscanner/usage create mode 100644 ports/eipscanner/vcpkg.json diff --git a/ports/eipscanner/portfile.cmake b/ports/eipscanner/portfile.cmake new file mode 100644 index 00000000000000..cd03c383f6d657 --- /dev/null +++ b/ports/eipscanner/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nimbuscontrols/EIPScanner + REF ${VERSION} + SHA512 24612e6eec97aa67dfd83ec90d3f1a961c69a63a17cb09679b9eb453750049628def8d488b9debbf1f322a800f9f54933dedca9b37fb1c5703e95460b89f2f43 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/eipscanner/usage b/ports/eipscanner/usage new file mode 100644 index 00000000000000..9bd5228b657839 --- /dev/null +++ b/ports/eipscanner/usage @@ -0,0 +1,4 @@ +eipscanner provides CMake targets: + + target_link_directories(main PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib) + target_link_libraries(main PRIVATE EIPScanner) diff --git a/ports/eipscanner/vcpkg.json b/ports/eipscanner/vcpkg.json new file mode 100644 index 00000000000000..4d334d25de585c --- /dev/null +++ b/ports/eipscanner/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "eipscanner", + "version": "1.3.0", + "description": "Free implementation of EtherNet/IP in C++ ", + "homepage": "https://eipscanner.readthedocs.io", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 6188c607e9135fbd91807f8666b5fd73191e4435 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sat, 1 Feb 2025 00:53:20 +0500 Subject: [PATCH 02/14] x-add-version --- versions/baseline.json | 4 ++++ versions/e-/eipscanner.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/e-/eipscanner.json diff --git a/versions/baseline.json b/versions/baseline.json index 9b16d64961a0aa..c0e0071d1b5a80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2540,6 +2540,10 @@ "baseline": "3.4.0", "port-version": 5 }, + "eipscanner": { + "baseline": "1.3.0", + "port-version": 0 + }, "elements": { "baseline": "2024-09-12", "port-version": 0 diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json new file mode 100644 index 00000000000000..d73b830eeeb48c --- /dev/null +++ b/versions/e-/eipscanner.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "75b848f93c772f77572c0402f7a114e78f265ba0", + "version": "1.3.0", + "port-version": 0 + } + ] +} From b7c4af5fbf82b537cfb4b73ee2ce1bb7d864e6d4 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sat, 1 Feb 2025 11:00:10 +0500 Subject: [PATCH 03/14] version 1.3.0 doesn't support building under window --- ports/eipscanner/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/eipscanner/vcpkg.json b/ports/eipscanner/vcpkg.json index 4d334d25de585c..ea1698b735f752 100644 --- a/ports/eipscanner/vcpkg.json +++ b/ports/eipscanner/vcpkg.json @@ -4,6 +4,7 @@ "description": "Free implementation of EtherNet/IP in C++ ", "homepage": "https://eipscanner.readthedocs.io", "license": "MIT", + "supports": "!windows", "dependencies": [ { "name": "vcpkg-cmake", From 703ce3d1d58bb3b8c4cfb8757c86a845843ab6f6 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sat, 1 Feb 2025 11:07:08 +0500 Subject: [PATCH 04/14] x-add-version --- versions/e-/eipscanner.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json index d73b830eeeb48c..20ffa1635baaf2 100644 --- a/versions/e-/eipscanner.json +++ b/versions/e-/eipscanner.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "75b848f93c772f77572c0402f7a114e78f265ba0", + "git-tree": "545a6e216bb15da49e19352d8e1347ce08240d1f", "version": "1.3.0", "port-version": 0 } From 81615d47edae9cb53100ef792fa5268b71119209 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sat, 1 Feb 2025 11:22:45 +0500 Subject: [PATCH 05/14] add fatal_error message --- ports/eipscanner/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/eipscanner/portfile.cmake b/ports/eipscanner/portfile.cmake index cd03c383f6d657..56cab165251917 100644 --- a/ports/eipscanner/portfile.cmake +++ b/ports/eipscanner/portfile.cmake @@ -1,3 +1,7 @@ +if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + message(FATAL_ERROR "This port version is not supported on Windows.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nimbuscontrols/EIPScanner From ba73cfaf9764ecc51b2978990cdb85873a35dc36 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sat, 1 Feb 2025 11:23:29 +0500 Subject: [PATCH 06/14] x-add-version --- versions/e-/eipscanner.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json index 20ffa1635baaf2..599f3cb8eb0b38 100644 --- a/versions/e-/eipscanner.json +++ b/versions/e-/eipscanner.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "545a6e216bb15da49e19352d8e1347ce08240d1f", + "git-tree": "3164d8f929a998cf811458bbd6448fa0c08fbf20", "version": "1.3.0", "port-version": 0 } From 4b47f94aacd1eb6fad70ca20f54680a08bc6e4e4 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sun, 2 Feb 2025 01:30:23 +0500 Subject: [PATCH 07/14] Update ports/eipscanner/portfile.cmake Co-authored-by: Kai Pastor --- ports/eipscanner/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/eipscanner/portfile.cmake b/ports/eipscanner/portfile.cmake index 56cab165251917..295237ba9849cd 100644 --- a/ports/eipscanner/portfile.cmake +++ b/ports/eipscanner/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) From 9dadbf6fe6e6d9b53593b975b4db73fff68c6816 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sun, 2 Feb 2025 01:32:20 +0500 Subject: [PATCH 08/14] add patches for package config --- ports/eipscanner/package_config.patch | 42 +++++++++++++++++++++++++++ ports/eipscanner/portfile.cmake | 6 +++- ports/eipscanner/targets.patch | 12 ++++++++ ports/eipscanner/usage | 6 ++-- 4 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 ports/eipscanner/package_config.patch create mode 100644 ports/eipscanner/targets.patch diff --git a/ports/eipscanner/package_config.patch b/ports/eipscanner/package_config.patch new file mode 100644 index 00000000000000..bb6dd9359bf5f6 --- /dev/null +++ b/ports/eipscanner/package_config.patch @@ -0,0 +1,42 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index dc2bbb9..7cb7d7e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -65,6 +65,7 @@ set_target_properties( + SOVERSION ${EIPSCANNER_MAJOR_VERSION}) + + install(TARGETS EIPScanner EIPScannerS ++ EXPORT EIPScannerTargets + LIBRARY + DESTINATION lib + ARCHIVE +@@ -73,3 +74,28 @@ install(TARGETS EIPScanner EIPScannerS + install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/ + DESTINATION include/EIPScanner + FILES_MATCHING PATTERN "*.h*") ++ ++ ++include(CMakePackageConfigHelpers) ++configure_package_config_file( ++ ../cmake/EIPScannerConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfig.cmake ++ INSTALL_DESTINATION lib/cmake/eipscanner ++) ++ ++write_basic_package_version_file( ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfigVersion.cmake ++ VERSION ${PROJECT_VERSION} ++ COMPATIBILITY SameMajorVersion ++) ++ ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfig.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfigVersion.cmake ++ DESTINATION lib/cmake/eipscanner ++) ++ ++install(EXPORT EIPScannerTargets ++ FILE EIPScannerTargets.cmake ++ DESTINATION lib/cmake/eipscanner ++) +\ No newline at end of file diff --git a/ports/eipscanner/portfile.cmake b/ports/eipscanner/portfile.cmake index 295237ba9849cd..00fab3923adfe2 100644 --- a/ports/eipscanner/portfile.cmake +++ b/ports/eipscanner/portfile.cmake @@ -8,15 +8,19 @@ vcpkg_from_github( REF ${VERSION} SHA512 24612e6eec97aa67dfd83ec90d3f1a961c69a63a17cb09679b9eb453750049628def8d488b9debbf1f322a800f9f54933dedca9b37fb1c5703e95460b89f2f43 HEAD_REF master + PATCHES + targets.patch + package_config.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) - vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/eipscanner) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/eipscanner/targets.patch b/ports/eipscanner/targets.patch new file mode 100644 index 00000000000000..779d444933eedb --- /dev/null +++ b/ports/eipscanner/targets.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/EIPScannerConfig.cmake.in b/cmake/EIPScannerConfig.cmake.in +new file mode 100644 +index 0000000..3e16bd1 +--- /dev/null ++++ b/cmake/EIPScannerConfig.cmake.in +@@ -0,0 +1,6 @@ ++@PACKAGE_INIT@ ++ ++include("${CMAKE_CURRENT_LIST_DIR}/EIPScannerTargets.cmake") ++ ++check_required_components(EIPScanner) ++ diff --git a/ports/eipscanner/usage b/ports/eipscanner/usage index 9bd5228b657839..105fcc3b0f3725 100644 --- a/ports/eipscanner/usage +++ b/ports/eipscanner/usage @@ -1,4 +1,4 @@ -eipscanner provides CMake targets: +The package EIPScanner provides CMake targets: - target_link_directories(main PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib) - target_link_libraries(main PRIVATE EIPScanner) + find_package(EIPScanner CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,EIPScanner,EIPScannerS>) From 53523a58a5b3f9df3d8059b5dd04f336ab75f5a3 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sun, 2 Feb 2025 01:34:38 +0500 Subject: [PATCH 09/14] x-add-version --- versions/e-/eipscanner.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json index 599f3cb8eb0b38..3bb5f2e118c16f 100644 --- a/versions/e-/eipscanner.json +++ b/versions/e-/eipscanner.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3164d8f929a998cf811458bbd6448fa0c08fbf20", + "git-tree": "e9b8e8e20b0c9c8fd2e2c8a7bb9cfabed39b1c10", "version": "1.3.0", "port-version": 0 } From be49a119a532cb5a8bf8df7caaf6c4a48818ae92 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sun, 2 Feb 2025 13:09:30 +0500 Subject: [PATCH 10/14] some fixes --- ports/eipscanner/package.patch | 76 +++++++++++++++++++++++++++ ports/eipscanner/package_config.patch | 42 --------------- ports/eipscanner/portfile.cmake | 7 +-- ports/eipscanner/targets.patch | 12 ----- ports/eipscanner/usage | 2 +- versions/e-/eipscanner.json | 2 +- 6 files changed, 79 insertions(+), 62 deletions(-) create mode 100644 ports/eipscanner/package.patch delete mode 100644 ports/eipscanner/package_config.patch delete mode 100644 ports/eipscanner/targets.patch diff --git a/ports/eipscanner/package.patch b/ports/eipscanner/package.patch new file mode 100644 index 00000000000000..70d0f59d6172ef --- /dev/null +++ b/ports/eipscanner/package.patch @@ -0,0 +1,76 @@ +diff --git a/cmake/EIPScannerConfig.cmake.in b/cmake/EIPScannerConfig.cmake.in +new file mode 100644 +index 0000000..3e16bd1 +--- /dev/null ++++ b/cmake/EIPScannerConfig.cmake.in +@@ -0,0 +1,6 @@ ++@PACKAGE_INIT@ ++ ++include("${CMAKE_CURRENT_LIST_DIR}/EIPScannerTargets.cmake") ++ ++check_required_components(EIPScanner) ++ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index dc2bbb9..ce8e10f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -50,12 +50,14 @@ if(ENABLE_VENDOR_SRC) + add_subdirectory(vendor) + endif() + +-add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) +-add_library(EIPScannerS STATIC ${SOURCE_FILES} ${VENDOR_FILES}) ++if(BUILD_SHARED_LIBS) ++ add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) ++else() ++ add_library(EIPScanner STATIC ${SOURCE_FILES} ${VENDOR_FILES}) ++endif() + + if(WIN32) + target_link_libraries(EIPScanner ws2_32) +- target_link_libraries(EIPScannerS ws2_32) + endif() + + set_target_properties( +@@ -64,7 +66,10 @@ set_target_properties( + VERSION ${EIPSCANNER_FULL_VERSION} + SOVERSION ${EIPSCANNER_MAJOR_VERSION}) + +-install(TARGETS EIPScanner EIPScannerS ++set_target_properties(EIPScanner PROPERTIES EXPORT_NAME eipscanner) ++ ++install(TARGETS EIPScanner ++ EXPORT EIPScanner + LIBRARY + DESTINATION lib + ARCHIVE +@@ -73,3 +78,29 @@ install(TARGETS EIPScanner EIPScannerS + install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/ + DESTINATION include/EIPScanner + FILES_MATCHING PATTERN "*.h*") ++ ++ ++include(CMakePackageConfigHelpers) ++configure_package_config_file( ++ ../cmake/EIPScannerConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfig.cmake ++ INSTALL_DESTINATION lib/cmake/eipscanner ++) ++ ++write_basic_package_version_file( ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfigVersion.cmake ++ VERSION ${PROJECT_VERSION} ++ COMPATIBILITY SameMajorVersion ++) ++ ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfig.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfigVersion.cmake ++ DESTINATION lib/cmake/eipscanner ++) ++ ++install(EXPORT EIPScanner ++ FILE EIPScannerTargets.cmake ++ NAMESPACE unofficial::eipscanner:: ++ DESTINATION lib/cmake/eipscanner ++) diff --git a/ports/eipscanner/package_config.patch b/ports/eipscanner/package_config.patch deleted file mode 100644 index bb6dd9359bf5f6..00000000000000 --- a/ports/eipscanner/package_config.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index dc2bbb9..7cb7d7e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -65,6 +65,7 @@ set_target_properties( - SOVERSION ${EIPSCANNER_MAJOR_VERSION}) - - install(TARGETS EIPScanner EIPScannerS -+ EXPORT EIPScannerTargets - LIBRARY - DESTINATION lib - ARCHIVE -@@ -73,3 +74,28 @@ install(TARGETS EIPScanner EIPScannerS - install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/ - DESTINATION include/EIPScanner - FILES_MATCHING PATTERN "*.h*") -+ -+ -+include(CMakePackageConfigHelpers) -+configure_package_config_file( -+ ../cmake/EIPScannerConfig.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfig.cmake -+ INSTALL_DESTINATION lib/cmake/eipscanner -+) -+ -+write_basic_package_version_file( -+ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfigVersion.cmake -+ VERSION ${PROJECT_VERSION} -+ COMPATIBILITY SameMajorVersion -+) -+ -+install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfig.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/EIPScannerConfigVersion.cmake -+ DESTINATION lib/cmake/eipscanner -+) -+ -+install(EXPORT EIPScannerTargets -+ FILE EIPScannerTargets.cmake -+ DESTINATION lib/cmake/eipscanner -+) -\ No newline at end of file diff --git a/ports/eipscanner/portfile.cmake b/ports/eipscanner/portfile.cmake index 00fab3923adfe2..36be5b2ed40fee 100644 --- a/ports/eipscanner/portfile.cmake +++ b/ports/eipscanner/portfile.cmake @@ -1,7 +1,3 @@ -if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - message(FATAL_ERROR "This port version is not supported on Windows.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nimbuscontrols/EIPScanner @@ -9,8 +5,7 @@ vcpkg_from_github( SHA512 24612e6eec97aa67dfd83ec90d3f1a961c69a63a17cb09679b9eb453750049628def8d488b9debbf1f322a800f9f54933dedca9b37fb1c5703e95460b89f2f43 HEAD_REF master PATCHES - targets.patch - package_config.patch + package.patch ) vcpkg_cmake_configure( diff --git a/ports/eipscanner/targets.patch b/ports/eipscanner/targets.patch deleted file mode 100644 index 779d444933eedb..00000000000000 --- a/ports/eipscanner/targets.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/EIPScannerConfig.cmake.in b/cmake/EIPScannerConfig.cmake.in -new file mode 100644 -index 0000000..3e16bd1 ---- /dev/null -+++ b/cmake/EIPScannerConfig.cmake.in -@@ -0,0 +1,6 @@ -+@PACKAGE_INIT@ -+ -+include("${CMAKE_CURRENT_LIST_DIR}/EIPScannerTargets.cmake") -+ -+check_required_components(EIPScanner) -+ diff --git a/ports/eipscanner/usage b/ports/eipscanner/usage index 105fcc3b0f3725..884251092dec70 100644 --- a/ports/eipscanner/usage +++ b/ports/eipscanner/usage @@ -1,4 +1,4 @@ The package EIPScanner provides CMake targets: find_package(EIPScanner CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,EIPScanner,EIPScannerS>) + target_link_libraries(main PRIVATE unofficial::eipscanner::eipscanner) diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json index 3bb5f2e118c16f..f1dc9167d1c85b 100644 --- a/versions/e-/eipscanner.json +++ b/versions/e-/eipscanner.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e9b8e8e20b0c9c8fd2e2c8a7bb9cfabed39b1c10", + "git-tree": "b1925ead8b61bfd60f26f8994749d7a77f17b087", "version": "1.3.0", "port-version": 0 } From a056104973692d8038a8269deac19b06b20be0e5 Mon Sep 17 00:00:00 2001 From: EfesX Date: Sun, 2 Feb 2025 14:40:28 +0500 Subject: [PATCH 11/14] use EXCLUDE_FROM_ALL approach --- ports/eipscanner/package.patch | 41 +++++++++++++--------------------- versions/e-/eipscanner.json | 2 +- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/ports/eipscanner/package.patch b/ports/eipscanner/package.patch index 70d0f59d6172ef..2e155ea275c524 100644 --- a/ports/eipscanner/package.patch +++ b/ports/eipscanner/package.patch @@ -11,45 +11,34 @@ index 0000000..3e16bd1 +check_required_components(EIPScanner) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index dc2bbb9..ce8e10f 100644 +index dc2bbb9..2d8671e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -50,12 +50,14 @@ if(ENABLE_VENDOR_SRC) - add_subdirectory(vendor) - endif() - --add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) --add_library(EIPScannerS STATIC ${SOURCE_FILES} ${VENDOR_FILES}) -+if(BUILD_SHARED_LIBS) -+ add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) -+else() -+ add_library(EIPScanner STATIC ${SOURCE_FILES} ${VENDOR_FILES}) -+endif() - - if(WIN32) - target_link_libraries(EIPScanner ws2_32) -- target_link_libraries(EIPScannerS ws2_32) - endif() - - set_target_properties( -@@ -64,7 +66,10 @@ set_target_properties( +@@ -64,7 +64,18 @@ set_target_properties( VERSION ${EIPSCANNER_FULL_VERSION} SOVERSION ${EIPSCANNER_MAJOR_VERSION}) -install(TARGETS EIPScanner EIPScannerS -+set_target_properties(EIPScanner PROPERTIES EXPORT_NAME eipscanner) ++if(BUILD_SHARED_LIBS) ++ set(install_target EIPScanner) ++ set_target_properties(EIPScanner PROPERTIES EXPORT_NAME eipscanner) ++ set_target_properties(EIPScannerS PROPERTIES EXCLUDE_FROM_ALL 1) ++else() ++ set(install_target EIPScannerS) ++ set_target_properties(EIPScannerS PROPERTIES EXPORT_NAME eipscanner) ++ set_target_properties(EIPScanner PROPERTIES EXCLUDE_FROM_ALL 1) ++endif() + -+install(TARGETS EIPScanner -+ EXPORT EIPScanner ++install(TARGETS ${install_target} ++ EXPORT ${install_target} LIBRARY DESTINATION lib ARCHIVE -@@ -73,3 +78,29 @@ install(TARGETS EIPScanner EIPScannerS +@@ -73,3 +84,28 @@ install(TARGETS EIPScanner EIPScannerS install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/ DESTINATION include/EIPScanner FILES_MATCHING PATTERN "*.h*") + -+ +include(CMakePackageConfigHelpers) +configure_package_config_file( + ../cmake/EIPScannerConfig.cmake.in @@ -69,7 +58,7 @@ index dc2bbb9..ce8e10f 100644 + DESTINATION lib/cmake/eipscanner +) + -+install(EXPORT EIPScanner ++install(EXPORT ${install_target} + FILE EIPScannerTargets.cmake + NAMESPACE unofficial::eipscanner:: + DESTINATION lib/cmake/eipscanner diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json index f1dc9167d1c85b..f323d163ab47c7 100644 --- a/versions/e-/eipscanner.json +++ b/versions/e-/eipscanner.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b1925ead8b61bfd60f26f8994749d7a77f17b087", + "git-tree": "5026a14a05932b28836c24be11f47adf40057266", "version": "1.3.0", "port-version": 0 } From dd8b183bbd40aa7f35cfc9551a708b02096a924f Mon Sep 17 00:00:00 2001 From: EfesX Date: Thu, 6 Feb 2025 00:20:34 +0500 Subject: [PATCH 12/14] add target_include_directories --- ports/eipscanner/package.patch | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/eipscanner/package.patch b/ports/eipscanner/package.patch index 2e155ea275c524..0df080a646813f 100644 --- a/ports/eipscanner/package.patch +++ b/ports/eipscanner/package.patch @@ -10,8 +10,20 @@ index 0000000..3e16bd1 + +check_required_components(EIPScanner) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68a291e..d2562a8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,6 +13,7 @@ option(TEST_ENABLED "Enable unit test" OFF) + option(EXAMPLE_ENABLED "Build examples" OFF) + + add_subdirectory(src) ++ + if (EXAMPLE_ENABLED) + add_subdirectory(examples) + endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index dc2bbb9..2d8671e 100644 +index dc2bbb9..d8d3cfa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,18 @@ set_target_properties( @@ -34,11 +46,16 @@ index dc2bbb9..2d8671e 100644 LIBRARY DESTINATION lib ARCHIVE -@@ -73,3 +84,28 @@ install(TARGETS EIPScanner EIPScannerS +@@ -73,3 +84,33 @@ install(TARGETS EIPScanner EIPScannerS install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/ DESTINATION include/EIPScanner FILES_MATCHING PATTERN "*.h*") + ++target_include_directories(${install_target} ++ INTERFACE ++ $ ++) ++ +include(CMakePackageConfigHelpers) +configure_package_config_file( + ../cmake/EIPScannerConfig.cmake.in From cc93c3174bb77b0a52eff782ab3c85ef524ab2ac Mon Sep 17 00:00:00 2001 From: EfesX Date: Thu, 6 Feb 2025 00:22:02 +0500 Subject: [PATCH 13/14] x-add-version --- versions/e-/eipscanner.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json index f323d163ab47c7..c51a4d0f6bec2a 100644 --- a/versions/e-/eipscanner.json +++ b/versions/e-/eipscanner.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5026a14a05932b28836c24be11f47adf40057266", + "git-tree": "863fbe1d71cfa52b450d2fa2ff35b0658d38d213", "version": "1.3.0", "port-version": 0 } From 028ce9e2ac89cbd9a3d249ccec8d7cdbe9b4775a Mon Sep 17 00:00:00 2001 From: EfesX Date: Thu, 6 Feb 2025 23:42:30 +0500 Subject: [PATCH 14/14] hollow commit ...for restart CI builds --- ports/eipscanner/portfile.cmake | 1 - versions/e-/eipscanner.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/eipscanner/portfile.cmake b/ports/eipscanner/portfile.cmake index 36be5b2ed40fee..27ce5243a18d54 100644 --- a/ports/eipscanner/portfile.cmake +++ b/ports/eipscanner/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( PATCHES package.patch ) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) diff --git a/versions/e-/eipscanner.json b/versions/e-/eipscanner.json index c51a4d0f6bec2a..ea22d265dc8c4f 100644 --- a/versions/e-/eipscanner.json +++ b/versions/e-/eipscanner.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "863fbe1d71cfa52b450d2fa2ff35b0658d38d213", + "git-tree": "4d614cf97b912cc20cca14a566542f106db03246", "version": "1.3.0", "port-version": 0 }