diff --git a/3rdparty/ext_vc/CMakeLists.txt b/3rdparty/ext_vc/CMakeLists.txt index cd618c5167..b61ec24408 100644 --- a/3rdparty/ext_vc/CMakeLists.txt +++ b/3rdparty/ext_vc/CMakeLists.txt @@ -1,44 +1,45 @@ SET(PREFIX_ext_vc "${EXTPREFIX}" ) if(APPLE) ExternalProject_Add( ext_vc DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} URL https://github.com/VcDevel/Vc/releases/download/1.4.1/Vc-1.4.1.tar.gz URL_HASH SHA1=46e852ab69192cf017a31d7c6d0b35d8aa8fea2d INSTALL_DIR ${PREFIX_ext_vc} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_vc} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PROCESSOR=x86 UPDATE_COMMAND "" ) elseif (WIN32) ExternalProject_Add( ext_vc DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} URL https://github.com/VcDevel/Vc/releases/download/1.3.3/Vc-1.3.3.tar.gz URL_HASH SHA1=3d3ddd29eca7c2b541fd8d0f00923e57f58d5ef0 PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/0001-Workaround-AVX-argument-failures.patch + COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/relocatable-vc-1.3-install.patch INSTALL_DIR ${PREFIX_ext_vc} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_vc} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PROCESSOR=x86 UPDATE_COMMAND "" ) else() ExternalProject_Add( ext_vc DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} URL https://github.com/VcDevel/Vc/releases/download/1.3.3/Vc-1.3.3.tar.gz URL_HASH SHA1=3d3ddd29eca7c2b541fd8d0f00923e57f58d5ef0 INSTALL_DIR ${PREFIX_ext_vc} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_vc} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PROCESSOR=x86 UPDATE_COMMAND "" ) endif() diff --git a/3rdparty/ext_vc/relocatable-vc-1.3-install.patch b/3rdparty/ext_vc/relocatable-vc-1.3-install.patch new file mode 100644 index 0000000000..21d53090d2 --- /dev/null +++ b/3rdparty/ext_vc/relocatable-vc-1.3-install.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9882637..2c2bad85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,8 +206,12 @@ set(Vc_VERSION_MAJOR ${CMAKE_MATCH_1}) + set(Vc_VERSION_MINOR ${CMAKE_MATCH_2}) + set(Vc_VERSION_PATCH ${CMAKE_MATCH_3}) + +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/VcConfig.cmake.in +- ${CMAKE_CURRENT_BINARY_DIR}/cmake/VcConfig.cmake @ONLY) ++include(CMakePackageConfigHelpers) ++configure_package_config_file( ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VcConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/VcConfig.cmake ++ INSTALL_DESTINATION lib${LIB_SUFFIX}/cmake/Vc ++ PATH_VARS CMAKE_INSTALL_PREFIX) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/VcConfigVersion.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake/VcConfigVersion.cmake @ONLY) + +diff --git a/cmake/VcConfig.cmake.in b/cmake/VcConfig.cmake.in +index 4a47e41e..48d37a80 100644 +--- a/cmake/VcConfig.cmake.in ++++ b/cmake/VcConfig.cmake.in +@@ -1,13 +1,15 @@ ++@PACKAGE_INIT@ ++ + set(Vc_VERSION_MAJOR @Vc_VERSION_MAJOR@) + set(Vc_VERSION_MINOR @Vc_VERSION_MINOR@) + set(Vc_VERSION_PATCH @Vc_VERSION_PATCH@) + set(Vc_VERSION @Vc_VERSION_MAJOR@.@Vc_VERSION_MINOR@.@Vc_VERSION_PATCH@) + set(Vc_VERSION_STRING "@Vc_VERSION_MAJOR@.@Vc_VERSION_MINOR@.@Vc_VERSION_PATCH@") + +-set(Vc_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") ++set(Vc_INSTALL_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +-set(Vc_LIB_DIR "@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@") +-find_path(Vc_INCLUDE_DIR Vc/global.h HINTS "@CMAKE_INSTALL_PREFIX@/include") ++set(Vc_LIB_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@") ++find_path(Vc_INCLUDE_DIR Vc/global.h HINTS "@PACKAGE_CMAKE_INSTALL_PREFIX@/include") + find_path(Vc_CMAKE_MODULES_DIR AddCompilerFlag.cmake HINTS "${Vc_LIB_DIR}/cmake/Vc") + list(APPEND CMAKE_MODULE_PATH "${Vc_CMAKE_MODULES_DIR}") +