Skip to content
Snippets Groups Projects
Commit 06d595da authored by Andrew Wilson's avatar Andrew Wilson :elephant:
Browse files

Merge branch 'update-approach-for-downloading-assimp-source' into 'master'

COMP: Improve source download strategy for Assimp project

See merge request iMSTK/iMSTK!770
parents 986e150f 9b901a6d
No related branches found
No related tags found
No related merge requests found
......@@ -5,22 +5,15 @@ include(imstkAddExternalProject)
# Download options
if(NOT DEFINED iMSTK_Assimp_GIT_SHA)
set(iMSTK_Assimp_GIT_SHA "fixCompilationError")
set(iMSTK_Assimp_GIT_SHA "ce3d6a91d2e0e945493c0fdeb162b50c9034e5f9") # imstk-v3.3.1-2016-07-08-a8673d482
endif()
if(NOT DEFINED iMSTK_Assimp_GIT_REPOSITORY)
set(EXTERNAL_PROJECT_DOWNLOAD_OPTIONS
URL https://gitlab.kitware.com/iMSTK/assimp/-/archive/${iMSTK_Assimp_GIT_SHA}/assimp-${iMSTK_Assimp_GIT_SHA}.zip
URL_HASH MD5=fab081af9dbd73a9a5c61cd33dd93340
)
else()
set(EXTERNAL_PROJECT_DOWNLOAD_OPTIONS
GIT_REPOSITORY ${iMSTK_Assimp_GIT_REPOSITORY}
GIT_TAG ${iMSTK_Assimp_GIT_SHA}
)
set(iMSTK_Assimp_GIT_REPOSITORY "https://gitlab.kitware.com/iMSTK/assimp.git")
endif()
imstk_add_external_project( Assimp
${EXTERNAL_PROJECT_DOWNLOAD_OPTIONS}
GIT_REPOSITORY ${iMSTK_Assimp_GIT_REPOSITORY}
GIT_TAG ${iMSTK_Assimp_GIT_SHA}
CMAKE_CACHE_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DASSIMP_BUILD_ASSIMP_TOOLS:BOOL=OFF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment