Commit 80cc16fb authored by Alexis Girault's avatar Alexis Girault

Merge branch 'specify-git-tags' into 'master'

COMP: Update to specific git_tags for external projects

Using a git branch name for an external project would update the repository of that external project when building iMSTK even though it would not be tested.

By hardcoding a certain commit #, we can make sure we need to specifically update the external project git_tag to update the external project.

This commit updates to the newer version of VegaFEM which should resolve the remaining issues on the Dashboard for Windows: VegaFEM-CMake@d1ab0858
> `export(PACKAGE VegaFEM)` was resulting in Vega being registered in a CMake Package Registry :
> https://cmake.org/Wiki/CMake/Tutorials/Package_Registry
> 
> Because of this, an incorrect version of VEGA could be directly linked against when doing `find_package(VegaFEM)`.
> 
> This should only be done when creating a package for installation:
> https://cmake.org/cmake/help/git-master/manual/cmake-packages.7.html#creating-packages

See merge request !94
parents 1d7176b4 6446ed74
......@@ -119,6 +119,5 @@ ExternalProject_Add( ${PROJECT_NAME}
CMAKE_ARGS
-D${PROJECT_NAME}_SUPERBUILD:BOOL=OFF
-D${PROJECT_NAME}_USE_OMNI:BOOL=${${PROJECT_NAME}_USE_OMNI}
${${PROJECT_NAME}_EXTERNAL_PROJECTS_PATHS}
DEPENDS ${${PROJECT_NAME}_DEPENDENCIES}
)
......@@ -9,7 +9,7 @@ endif(WIN32)
include(imstkAddExternalProject)
imstk_add_external_project( LibNiFalcon
GIT_REPOSITORY https://github.com/agirault/libnifalcon
GIT_TAG libusb1-windows
GIT_TAG 47586d4e21c987fb9e3ce822bf707c53e8fc4e52
INSTALL_COMMAND ${SKIP_STEP_COMMAND}
CMAKE_ARGS
-DBUILD_TESTING:BOOL=OFF
......
......@@ -4,7 +4,7 @@
include(imstkAddExternalProject)
imstk_add_external_project( SCCD
GIT_REPOSITORY git@gitlab.kitware.com:iMSTK/SCCD.git
GIT_TAG iMSTK
GIT_TAG 7145cc437ff9f9744a8363736590260e2e660bb6
INSTALL_COMMAND ${SKIP_STEP_COMMAND}
CMAKE_ARGS
-DBUILD_SAMPLE_APP:BOOL=OFF
......
......@@ -31,7 +31,7 @@ endif()
include(imstkAddExternalProject)
imstk_add_external_project( VRPN
GIT_REPOSITORY https://github.com/agirault/vrpn
GIT_TAG improve-openhaptics
GIT_TAG 63ccb99d7f9e59d594716fd530ceac99b1ed7fbc
INSTALL_COMMAND ${SKIP_STEP_COMMAND}
CMAKE_ARGS
-DBUILD_TESTING:BOOL=OFF
......
......@@ -4,7 +4,7 @@
include(imstkAddExternalProject)
imstk_add_external_project( VTK
GIT_REPOSITORY git@gitlab.kitware.com:iMSTK/vtk.git
GIT_TAG multi-textures
GIT_TAG 82896a55877fc060a0f0207dea10677f7d425f38
INSTALL_COMMAND ${SKIP_STEP_COMMAND}
CMAKE_ARGS
-DBUILD_EXAMPLES:BOOL=OFF
......
......@@ -9,7 +9,7 @@ endif(WIN32)
include(imstkAddExternalProject)
imstk_add_external_project( VegaFEM
GIT_REPOSITORY git@gitlab.kitware.com:iMSTK/VegaFEM-CMake.git
GIT_TAG iMSTK
GIT_TAG 7bc1bda6a873e2cf4486f9ec3fe6b7b90da76941
INSTALL_COMMAND ${SKIP_STEP_COMMAND}
CMAKE_ARGS
-DVegaFEM_ENABLE_PTHREADS_SUPPORT:BOOL=ON
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment