From 6446ed7496313bceaebbd0b871f162ac400ba1a7 Mon Sep 17 00:00:00 2001 From: Alexis Girault <alexis.girault@kitware.com> Date: Thu, 29 Sep 2016 14:57:10 -0400 Subject: [PATCH] COMP: Update VegaFEM to find vega & PThreads Integrate the following commit: https://gitlab.kitware.com/iMSTK/VegaFEM-CMake/commit/7bc1bda6a873e2cf4486f9ec3fe6b7b90da76941 Also remove useless iMSTK_EXTERNAL_PROJECTS_PATHS variable in External/CMakeLists.txt --- CMake/External/CMakeLists.txt | 1 - CMake/External/External_VegaFEM.cmake | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMake/External/CMakeLists.txt b/CMake/External/CMakeLists.txt index 0b08bf71e..8142bb805 100644 --- a/CMake/External/CMakeLists.txt +++ b/CMake/External/CMakeLists.txt @@ -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} ) diff --git a/CMake/External/External_VegaFEM.cmake b/CMake/External/External_VegaFEM.cmake index 1f448510f..925f71998 100644 --- a/CMake/External/External_VegaFEM.cmake +++ b/CMake/External/External_VegaFEM.cmake @@ -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 d1ab0858675d9dbc64345038b3e25cac19b99bbe + GIT_TAG 7bc1bda6a873e2cf4486f9ec3fe6b7b90da76941 INSTALL_COMMAND ${SKIP_STEP_COMMAND} CMAKE_ARGS -DVegaFEM_ENABLE_PTHREADS_SUPPORT:BOOL=ON -- GitLab