diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ignition-modularscripts/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ignition-modularscripts/ignition_modular_library.cmake | 18 | ||||
| -rw-r--r-- | ports/ignition-plugin1/CONTROL | 5 | ||||
| -rw-r--r-- | ports/ignition-plugin1/portfile.cmake | 7 |
4 files changed, 28 insertions, 4 deletions
diff --git a/ports/ignition-modularscripts/CONTROL b/ports/ignition-modularscripts/CONTROL index 4dd2ac418..efde5f1b4 100644 --- a/ports/ignition-modularscripts/CONTROL +++ b/ports/ignition-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: ignition-modularscripts
-Version: 2020-05-09
+Version: 2020-05-16
Description: Vcpkg helpers to package ignition libraries
diff --git a/ports/ignition-modularscripts/ignition_modular_library.cmake b/ports/ignition-modularscripts/ignition_modular_library.cmake index 8b04d8177..f7b772d5f 100644 --- a/ports/ignition-modularscripts/ignition_modular_library.cmake +++ b/ports/ignition-modularscripts/ignition_modular_library.cmake @@ -10,7 +10,18 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC # If necessary, move the CMake config files if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake") - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${CMAKE_PACKAGE_NAME}" TARGET_PATH "share/${CMAKE_PACKAGE_NAME}") + # Some ignition libraries install library subcomponents, that are effectively additional cmake packages + # with name ${CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_fixup_cmake_targets for them as well + file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES + LIST_DIRECTORIES TRUE + RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/" + "${CURRENT_PACKAGES_DIR}/lib/cmake/*") + + foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES) + vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" + TARGET_PATH "share/${COMPONENT_CMAKE_PACKAGE_NAME}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) + endforeach() file(GLOB_RECURSE CMAKE_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/lib/cmake/${CMAKE_PACKAGE_NAME}/*") @@ -19,8 +30,9 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC "${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/") endif() - # Remove debug files - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + # Remove unused files files + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/ignition-plugin1/CONTROL b/ports/ignition-plugin1/CONTROL new file mode 100644 index 000000000..ba3aa4c31 --- /dev/null +++ b/ports/ignition-plugin1/CONTROL @@ -0,0 +1,5 @@ +Source: ignition-plugin1
+Version: 1.1.0 +Homepage: https://ignitionrobotics.org/libs/plugin
+Build-Depends: dlfcn-win32 (windows|uwp), ignition-cmake2, ignition-modularscripts
+Description: Library for registering plugin libraries and dynamically loading them at runtime
diff --git a/ports/ignition-plugin1/portfile.cmake b/ports/ignition-plugin1/portfile.cmake new file mode 100644 index 000000000..daa626047 --- /dev/null +++ b/ports/ignition-plugin1/portfile.cmake @@ -0,0 +1,7 @@ +include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake)
+
+set(PACKAGE_VERSION "1.1.0")
+ignition_modular_library(NAME plugin
+ VERSION ${PACKAGE_VERSION}
+ REF "ignition-plugin_${PACKAGE_VERSION}"
+ SHA512 0657c5816e67d02329a79364050b8a56957180e5b7481b01696c7369b063cbfedfc93793a8ad92d87d242d24e476283dc7847bd810a3de98d3ec5ae7d640568c)
|