Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fastcdr/jack2/fcl/ensmallen/hwloc] Update to latest release #13559

Merged
merged 7 commits into from
Oct 9, 2020

Conversation

PhoebeHui
Copy link
Contributor

Related to #13536

Update the version to latest release

  • fastcdr/ensmallen: fix the cmake targets file in new revision.
  • jack2: the readme file name changed in new revision.
  • fcl: the config name changed to fcl-config, and it already find dependency port.
  • hwloc: the directory for the source files changed, and removed and Added one file in new reversion.

@PhoebeHui PhoebeHui added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Sep 16, 2020
@PhoebeHui PhoebeHui marked this pull request as ready for review September 17, 2020 06:39
ports/ensmallen/portfile.cmake Outdated Show resolved Hide resolved
ports/hwloc/portfile.cmake Outdated Show resolved Hide resolved
ports/hwloc/CONTROL Show resolved Hide resolved
ports/ensmallen/portfile.cmake Outdated Show resolved Hide resolved
ports/jack2/portfile.cmake Outdated Show resolved Hide resolved
ports/ensmallen/portfile.cmake Show resolved Hide resolved
@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Sep 21, 2020

file(READ ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake FCL_CONFIG)
string(REPLACE "unset(_expectedTargets)"
"unset(_expectedTargets)\n\nfind_package(octomap REQUIRED)\nfind_package(ccd REQUIRED)" FCL_CONFIG "${FCL_CONFIG}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the fclConfig file now contain find_dependency() calls?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it uses the -config rather than Config form now, and yes:

PS C:\Dev\vcpkg> type .\installed\x86-windows\share\fcl\fcl-config.cmake
# Generated by CMake 3.17.2 for fcl.


####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
####### Any changes to this file will be overwritten by the next CMake run ####
####### The input file was fcl-config.cmake.in                            ########

get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)

macro(set_and_check _var _file)
  set(${_var} "${_file}")
  if(NOT EXISTS "${_file}")
    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
  endif()
endmacro()

macro(check_required_components _NAME)
  foreach(comp ${${_NAME}_FIND_COMPONENTS})
    if(NOT ${_NAME}_${comp}_FOUND)
      if(${_NAME}_FIND_REQUIRED_${comp})
        set(${_NAME}_FOUND FALSE)
      endif()
    endif()
  endforeach()
endmacro()

####################################################################################

set(FCL_VERSION "0.6.1")
set(FCL_ABI_VERSION "0.6")

set_and_check(FCL_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include")
set(FCL_LIBRARIES fcl)
set_and_check(FCL_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/lib")

include(CMakeFindDependencyMacro)

find_dependency(ccd)
find_dependency(Eigen3)
find_dependency(octomap)

include("${CMAKE_CURRENT_LIST_DIR}/fcl-targets.cmake")

check_required_components(fcl)

ports/fastcdr/portfile.cmake Outdated Show resolved Hide resolved
@BillyONeal
Copy link
Member

@ras0219-msft looks good :

C:\Dev\vcpkg>.\vcpkg.exe install fastcdr
Computing installation plan...
The following packages will be built and installed:
    fastcdr[core]:x86-windows
Detecting compiler hash for triplet x86-windows...
A suitable version of powershell-core was not found (required v7.0.3). Downloading portable powershell-core v7.0.3...
Extracting powershell-core...
Starting package 1/1: fastcdr:x86-windows
Building package fastcdr[core]:x86-windows...
Could not locate cached archive: C:\Users\billy\AppData\Local\vcpkg\archives\c4\c4b0fbba75c0e109e1e8d93252f1bcfbcd594a25.zip
-- Downloading https://github.com/eProsima/Fast-CDR/archive/065d49248bd4afbae670836ee1f1c718b9760dde.tar.gz...
-- Extracting source C:/Dev/vcpkg/downloads/eProsima-Fast-CDR-065d49248bd4afbae670836ee1f1c718b9760dde.tar.gz
-- Applying patch install-cmake.patch
-- Using source at C:/Dev/vcpkg/buildtrees/fastcdr/src/18b9760dde-47acd16266.clean
-- Configuring x86-windows
-- Building x86-windows-dbg
-- Building x86-windows-rel
-- Installing: C:/Dev/vcpkg/packages/fastcdr_x86-windows/share/fastcdr/copyright
-- Performing post-build validation
-- Performing post-build validation done
Stored binary cache: C:\Users\billy\AppData\Local\vcpkg\archives\c4\c4b0fbba75c0e109e1e8d93252f1bcfbcd594a25.zip
Building package fastcdr[core]:x86-windows... done
Installing package fastcdr[core]:x86-windows...
Installing package fastcdr[core]:x86-windows... done
Elapsed time for package fastcdr:x86-windows: 6.997 s

Total elapsed time: 12.33 s

The package fastcdr:x86-windows provides CMake targets:

    find_package(fastcdr CONFIG REQUIRED)
    target_link_libraries(main PRIVATE fastcdr)


C:\Dev\vcpkg>cd test

C:\Dev\vcpkg\test>type CMakeLists.txt
project(example CXX)
find_package(fastcdr CONFIG REQUIRED)

C:\Dev\vcpkg\test>cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=C:\Dev\vcpkg\scripts\buildsystems\vcpkg.cmake -S . -B build
-- The CXX compiler identification is MSVC 19.28.29304.1
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Preview/VC/Tools/MSVC/14.28.29304/bin/Hostx86/x86/cl.exe - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Warning (dev) in CMakeLists.txt:
  No cmake_minimum_required command is present.  A line of code such as

    cmake_minimum_required(VERSION 3.18)

  should be added at the top of the file.  The version specified may be lower
  if you wish to support older CMake versions for this project.  For more
  information run "cmake --help-policy CMP0000".
This warning is for project developers.  Use -Wno-dev to suppress it.

-- Configuring done
-- Generating done
-- Build files have been written to: C:/Dev/vcpkg/test/build

C:\Dev\vcpkg\test>ninja -C build
ninja: Entering directory `build'
ninja: no work to do.

@BillyONeal BillyONeal merged commit 7e495c0 into microsoft:master Oct 9, 2020
@BillyONeal
Copy link
Member

Thanks for your contribution!

@PhoebeHui PhoebeHui deleted the dev/Phoebe/manyports_1 branch October 22, 2020 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants