[fastcdr/jack2/fcl/ensmallen/hwloc] Update to latest release#13559
Merged
BillyONeal merged 7 commits intomicrosoft:masterfrom Oct 9, 2020
Merged
[fastcdr/jack2/fcl/ensmallen/hwloc] Update to latest release#13559BillyONeal merged 7 commits intomicrosoft:masterfrom
BillyONeal merged 7 commits intomicrosoft:masterfrom
Conversation
NancyLi1013
suggested changes
Sep 21, 2020
NancyLi1013
approved these changes
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}") |
Contributor
There was a problem hiding this comment.
Does the fclConfig file now contain find_dependency() calls?
Member
There was a problem hiding this comment.
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)
Member
|
@ras0219-msft looks good : |
BillyONeal
approved these changes
Oct 9, 2020
Member
|
Thanks for your contribution! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related to #13536
Update the version to latest release