Try adding Draco support through Hunter
parent
efae3b83b1
commit
62c991290b
|
@ -69,6 +69,12 @@ jobs:
|
||||||
repository: cpp-pm/polly
|
repository: cpp-pm/polly
|
||||||
path: cmake/polly
|
path: cmake/polly
|
||||||
|
|
||||||
|
- name: Remove contrib directory for Hunter builds
|
||||||
|
if: contains(matrix.name, 'hunter')
|
||||||
|
uses: JesseTG/rm@v1
|
||||||
|
with:
|
||||||
|
path: contrib
|
||||||
|
|
||||||
- name: Cache DX SDK
|
- name: Cache DX SDK
|
||||||
id: dxcache
|
id: dxcache
|
||||||
if: contains(matrix.name, 'windows')
|
if: contains(matrix.name, 'windows')
|
||||||
|
|
|
@ -46,8 +46,8 @@ option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
|
||||||
IF(ASSIMP_HUNTER_ENABLED)
|
IF(ASSIMP_HUNTER_ENABLED)
|
||||||
include("cmake/HunterGate.cmake")
|
include("cmake/HunterGate.cmake")
|
||||||
HunterGate(
|
HunterGate(
|
||||||
URL "https://github.com/cpp-pm/hunter/archive/v0.23.269.tar.gz"
|
URL "https://github.com/cpp-pm/hunter/archive/v0.23.293.tar.gz"
|
||||||
SHA1 "64024b7b95b4c86d50ae05b926814448c93a70a0"
|
SHA1 "e8e5470652db77149d9b38656db2a6c0b7642693"
|
||||||
)
|
)
|
||||||
|
|
||||||
add_definitions(-DASSIMP_USE_HUNTER)
|
add_definitions(-DASSIMP_USE_HUNTER)
|
||||||
|
@ -585,7 +585,6 @@ ELSE()
|
||||||
set(DRACO_TESTS OFF CACHE BOOL "" FORCE)
|
set(DRACO_TESTS OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
IF(ASSIMP_HUNTER_ENABLED)
|
IF(ASSIMP_HUNTER_ENABLED)
|
||||||
# hunter is untested
|
|
||||||
hunter_add_package(draco)
|
hunter_add_package(draco)
|
||||||
find_package(draco CONFIG REQUIRED)
|
find_package(draco CONFIG REQUIRED)
|
||||||
ELSE()
|
ELSE()
|
||||||
|
|
|
@ -10,5 +10,9 @@ find_package(polyclipping CONFIG REQUIRED)
|
||||||
find_package(zip CONFIG REQUIRED)
|
find_package(zip CONFIG REQUIRED)
|
||||||
find_package(pugixml CONFIG REQUIRED)
|
find_package(pugixml CONFIG REQUIRED)
|
||||||
|
|
||||||
|
if(@ASSIMP_BUILD_DRACO@)
|
||||||
|
find_package(draco CONFIG REQUIRED)
|
||||||
|
endif()
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
|
||||||
check_required_components("@PROJECT_NAME@")
|
check_required_components("@PROJECT_NAME@")
|
||||||
|
|
Loading…
Reference in New Issue