mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 22:29:08 +08:00
b97849d258
* [libp7client, libp7-baical] Combine identical ports and update to libp7client 5.6. In a recent CI build, we started getting output like: Installing package libp7-baical[core]:x86-windows... The following files are already installed in C:/Dev/vcpkg/installed/x86-windows and are in conflict with libp7-baical:x86-windows Installed by libp7client:x86-windows bin/P7x32.dll bin/P7x32.pdb debug/bin/P7x32d.dll debug/bin/P7x32d.pdb include/P7/GTypes.h include/P7/P7_Client.h include/P7/P7_Cproxy.h include/P7/P7_Extensions.h include/P7/P7_Telemetry.h include/P7/P7_Trace.h It turns out that these ports are identical, they are just different versions of the same library. The libp7-baical version supported more platforms and was simpler, so took that one and updated it to a current version. * [ignition-modularscripts, ignition-msgs1] Attempt to fix intermittent build failures by disabling parallel configure. * Fix several "passing: remove from fail list." * [akali] Disable parallel configure. REGRESSION: akali:x64-windows. If expected, add akali:x64-windows=fail to .\scripts\ci.baseline.txt. Attempts to fix: CMake Error: Could not open file for write in copy operation C:/Dev/vcpkg/buildtrees/akali/src/fc94eb83a9-01654d3f7c.clean/include/akali_config.h.tmp CMake Error: : System Error: Permission denied CMake Error at CMakeLists.txt:20 (configure_file): configure_file Problem configuring file * [nvtt] Devendor libsquish This was regressed by https://github.com/microsoft/vcpkg/pull/13674 REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt. Installing package nvtt[core]:x64-linux... The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux Installed by libsquish:x64-linux debug/lib/libsquishd.a include/squish.h lib/libsquish.a * [knet] Disable parallel configure. REGRESSION: knet:x64-windows. If expected, add knet:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at src/CMakeLists.txt:1 (configure_file): configure_file Problem configuring file * [libnice] Diable parallel configure. REGRESSION: libnice:x64-windows. If expected, add libnice:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at CMakeLists.txt:13 (configure_file): configure_file Problem configuring file
149 lines
6.0 KiB
CMake
149 lines
6.0 KiB
CMake
|
|
function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME IML_DISABLE_PKGCONFIG_INSTALL)
|
|
vcpkg_configure_cmake(
|
|
SOURCE_PATH ${SOURCE_PATH}
|
|
PREFER_NINJA
|
|
DISABLE_PARALLEL_CONFIGURE
|
|
OPTIONS -DBUILD_TESTING=OFF
|
|
)
|
|
|
|
vcpkg_install_cmake()
|
|
|
|
# If necessary, move the CMake config files
|
|
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake")
|
|
# 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}/*")
|
|
|
|
file(COPY ${CMAKE_RELEASE_FILES} DESTINATION
|
|
"${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/")
|
|
endif()
|
|
|
|
# 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)
|
|
|
|
# Make pkg-config files relocatable
|
|
if(NOT IML_DISABLE_PKGCONFIG_INSTALL)
|
|
if(VCPKG_TARGET_IS_LINUX)
|
|
set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread)
|
|
endif()
|
|
vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES})
|
|
else()
|
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig
|
|
${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
|
|
endif()
|
|
|
|
# Find the relevant license file and install it
|
|
if(EXISTS "${SOURCE_PATH}/LICENSE")
|
|
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE")
|
|
elseif(EXISTS "${SOURCE_PATH}/README.md")
|
|
set(LICENSE_PATH "${SOURCE_PATH}/README.md")
|
|
endif()
|
|
file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
|
endfunction()
|
|
|
|
## # ignition_modular_library
|
|
##
|
|
## Download and build a library from the Ignition Robotics project ( https://ignitionrobotics.org/ ).
|
|
##
|
|
## ## Usage:
|
|
## ```cmake
|
|
## ignition_modular_library(NAME <name>
|
|
## VERSION <version>
|
|
## SHA512 <sha512>
|
|
## [REF <ref>]
|
|
## [HEAD_REF <head_ref>]
|
|
## [PATCHES <patches>]
|
|
## [CMAKE_PACKAGE_NAME <cmake_package_name>]
|
|
## [DISABLE_PKGCONFIG_INSTALL])
|
|
## ```
|
|
##
|
|
## ## Parameters:
|
|
## ### NAME
|
|
## The name of the specific ignition library, i.e. `cmake` for `ignition-cmake0`, `math` for `ignition-math4`.
|
|
##
|
|
## ### VERSION
|
|
## The complete version number.
|
|
##
|
|
## ### SHA512
|
|
## The SHA512 hash that should match the downloaded archive. This is forwarded to the `vcpkg_from_github` command.
|
|
##
|
|
## ### REF
|
|
## Reference to the tag of the desired release. This is forwarded to the `vcpkg_from_github` command.
|
|
## If not specified, defaults to `ignition-${NAME}${MAJOR_VERSION}_${VERSION}`.
|
|
##
|
|
## ### HEAD_REF
|
|
## Reference (tag) to the desired release. This is forwarded to the `vcpkg_from_github` command.
|
|
## If not specified, defaults to `ign-${NAME}${MAJOR_VERSION}`.
|
|
##
|
|
## ### PATCHES
|
|
## A list of patches to be applied to the extracted sources.
|
|
## This is forwarded to the `vcpkg_from_github` command.
|
|
##
|
|
## ### CMAKE_PACKAGE_NAME
|
|
## The name of the CMake package for the port.
|
|
## If not specified, defaults to `ignition-${NAME}${MAJOR_VERSION}`.
|
|
##
|
|
## ### DISABLE_PKGCONFIG_INSTALL
|
|
## If present, disable installation of .pc pkg-config configuration files.
|
|
##
|
|
##
|
|
## ## Examples:
|
|
##
|
|
## * [ignition-cmake0](https://github.com/Microsoft/vcpkg/blob/master/ports/ignition-cmake0/portfile.cmake)
|
|
## * [ignition-math4](https://github.com/Microsoft/vcpkg/blob/master/ports/ignition-math4/portfile.cmake)
|
|
## * [ignition-fuel-tools1](https://github.com/Microsoft/vcpkg/blob/master/ports/ignition-fuel-tools1/portfile.cmake)
|
|
function(ignition_modular_library)
|
|
set(options DISABLE_PKGCONFIG_INSTALL)
|
|
set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME)
|
|
set(multiValueArgs PATCHES)
|
|
cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
|
|
|
string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION})
|
|
list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION)
|
|
|
|
# If the REF option is omitted, use the canonical one
|
|
if(NOT DEFINED IML_REF)
|
|
set(IML_REF "ignition-${IML_NAME}${IML_MAJOR_VERSION}_${IML_VERSION}")
|
|
endif()
|
|
|
|
# If the HEAD_REF option is omitted, use the canonical one
|
|
if(NOT DEFINED IML_HEAD_REF)
|
|
set(IML_HEAD_REF "ign-${IML_NAME}${IML_MAJOR_VERSION}")
|
|
endif()
|
|
|
|
# If the CMAKE_PACKAGE_NAME option is omitted, use the canonical one
|
|
set(DEFAULT_CMAKE_PACKAGE_NAME "ignition-${IML_NAME}${IML_MAJOR_VERSION}")
|
|
if(NOT DEFINED IML_CMAKE_PACKAGE_NAME)
|
|
set(IML_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME})
|
|
endif()
|
|
|
|
# Download library from github, to support also the --head option
|
|
vcpkg_from_github(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
REPO ignitionrobotics/ign-${IML_NAME}
|
|
REF ${IML_REF}
|
|
SHA512 ${IML_SHA512}
|
|
HEAD_REF ${IML_HEAD_REF}
|
|
PATCHES ${IML_PATCHES}
|
|
)
|
|
|
|
# Build library
|
|
ignition_modular_build_library(${IML_NAME} ${IML_MAJOR_VERSION} ${SOURCE_PATH} ${IML_CMAKE_PACKAGE_NAME} ${DEFAULT_CMAKE_PACKAGE_NAME} ${IML_DISABLE_PKGCONFIG_INSTALL})
|
|
endfunction()
|