diff options
| author | Silvio Traversaro <silvio.traversaro@iit.it> | 2020-03-11 00:49:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 16:49:53 -0700 |
| commit | 249b8555eb9e83ca40461f3f8f2c8a88b745d15f (patch) | |
| tree | a9b3c7d25cb7b618ab1d94b1819e122a15992418 /ports/ignition-modularscripts | |
| parent | b813a777e8424a30116ea2a3d32973a5cfdbb005 (diff) | |
| download | vcpkg-249b8555eb9e83ca40461f3f8f2c8a88b745d15f.tar.gz vcpkg-249b8555eb9e83ca40461f3f8f2c8a88b745d15f.zip | |
[ignition-cmake2] Add new port 🤖 (#10014)
* ignition-modularscripts: move CMake config files only if necessary
Some ignition libraries (such as ignition-cmake2) already install the
CMake config file in the location required by vcpkg
* Add new port ignition-cmake2
Diffstat (limited to 'ports/ignition-modularscripts')
| -rw-r--r-- | ports/ignition-modularscripts/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ignition-modularscripts/ignition_modular_library.cmake | 26 |
2 files changed, 13 insertions, 15 deletions
diff --git a/ports/ignition-modularscripts/CONTROL b/ports/ignition-modularscripts/CONTROL index 796056b10..2ea04f67a 100644 --- a/ports/ignition-modularscripts/CONTROL +++ b/ports/ignition-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: ignition-modularscripts
-Version: 2019-09-11
+Version: 2020-02-10
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 5672ab8f4..8ce00116b 100644 --- a/ports/ignition-modularscripts/ignition_modular_library.cmake +++ b/ports/ignition-modularscripts/ignition_modular_library.cmake @@ -8,23 +8,21 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC vcpkg_install_cmake() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${CMAKE_PACKAGE_NAME}" TARGET_PATH "share/${CMAKE_PACKAGE_NAME}") + # 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}") - file(GLOB_RECURSE CMAKE_RELEASE_FILES - "${CURRENT_PACKAGES_DIR}/lib/cmake/${CMAKE_PACKAGE_NAME}/*") + file(GLOB_RECURSE CMAKE_RELEASE_FILES + "${CURRENT_PACKAGES_DIR}/lib/cmake/${CMAKE_PACKAGE_NAME}/*") - file(COPY ${CMAKE_RELEASE_FILES} DESTINATION - "${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/") + file(COPY ${CMAKE_RELEASE_FILES} DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/") - # Remove debug files - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/share) - - - - # Post-build test for cmake libraries - vcpkg_test_cmake(PACKAGE_NAME ${CMAKE_PACKAGE_NAME}) + # Remove debug files + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/share) + endif() # Find the relevant license file and install it if(EXISTS "${SOURCE_PATH}/LICENSE") |