-
Notifications
You must be signed in to change notification settings - Fork 6.1k
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
Conversation
|
||
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}") |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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)
@ras0219-msft looks good :
|
Thanks for your contribution! |
Related to #13536
Update the version to latest release