Skip to content

Commit

Permalink
Try adding Draco support through Hunter
Browse files Browse the repository at this point in the history
  • Loading branch information
rbsheth committed Jan 29, 2021
1 parent efae3b8 commit 62c9912
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,13 @@ jobs:
uses: actions/checkout@v2
with:
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
id: dxcache
Expand Down
19 changes: 9 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
IF(ASSIMP_HUNTER_ENABLED)
include("cmake/HunterGate.cmake")
HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.23.269.tar.gz"
SHA1 "64024b7b95b4c86d50ae05b926814448c93a70a0"
URL "https://github.com/cpp-pm/hunter/archive/v0.23.293.tar.gz"
SHA1 "e8e5470652db77149d9b38656db2a6c0b7642693"
)

add_definitions(-DASSIMP_USE_HUNTER)
Expand Down Expand Up @@ -583,9 +583,8 @@ ELSE()
set(DRACO_MAYA_PLUGIN OFF CACHE BOOL "" FORCE)
set(DRACO_UNITY_PLUGIN OFF CACHE BOOL "" FORCE)
set(DRACO_TESTS OFF CACHE BOOL "" FORCE)

IF(ASSIMP_HUNTER_ENABLED)
# hunter is untested
hunter_add_package(draco)
find_package(draco CONFIG REQUIRED)
ELSE()
Expand All @@ -607,7 +606,7 @@ ELSE()
"-fvisibility=default"
)
ENDIF()

ADD_SUBDIRECTORY( "contrib/draco" )

if(MSVC OR WIN32)
Expand All @@ -619,19 +618,19 @@ ELSE()
set(draco_LIBRARIES "draco_static")
endif()
endif()

# Don't build the draco command-line tools by default
set_target_properties(draco_encoder draco_decoder PROPERTIES
EXCLUDE_FROM_ALL TRUE
EXCLUDE_FROM_DEFAULT_BUILD TRUE
)

TARGET_USE_COMMON_OUTPUT_DIRECTORY(${draco_LIBRARIES})
TARGET_USE_COMMON_OUTPUT_DIRECTORY(draco_encoder)
TARGET_USE_COMMON_OUTPUT_DIRECTORY(draco_decoder)

set(draco_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/draco/src")

# This is probably wrong
INSTALL( TARGETS ${draco_LIBRARIES}
EXPORT "${TARGETS_EXPORT_NAME}"
Expand Down Expand Up @@ -661,7 +660,7 @@ IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
ADD_SUBDIRECTORY( tools/assimp_cmd/ )
ENDIF ()

IF ( ASSIMP_BUILD_SAMPLES)
IF ( ASSIMP_BUILD_SAMPLES )
SET( SAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/samples )
SET( SAMPLES_SHARED_CODE_DIR ${SAMPLES_DIR}/SharedCode )
IF ( WIN32 )
Expand Down
4 changes: 4 additions & 0 deletions cmake/assimp-hunter-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@ find_package(polyclipping CONFIG REQUIRED)
find_package(zip CONFIG REQUIRED)
find_package(pugixml CONFIG REQUIRED)

if(@ASSIMP_BUILD_DRACO@)
find_package(draco CONFIG REQUIRED)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
check_required_components("@PROJECT_NAME@")

0 comments on commit 62c9912

Please sign in to comment.