Skip to content
This repository was archived by the owner on Sep 29, 2025. It is now read-only.

Commit 3594001

Browse files
committed
ENH: Update imstkSolveDependencies module based on commontk/Artichoke@4176c39f9
Removes obsolete setting of CMAKE_GENERATOR_* variables in imstk_add_external_project, indeed these variables are now automatically passed to projects from within the updated imstkSolveDependencies CMake module.
1 parent cb48b6e commit 3594001

File tree

2 files changed

+394
-38
lines changed

2 files changed

+394
-38
lines changed

CMake/Utilities/imstkAddExternalProject.cmake

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ macro(imstk_add_external_project extProj)
7878
# If needs to download and build
7979
#-----------------------------------------------------------------------------
8080
if(NOT DEFINED ${extProj}_DIR AND NOT ${USE_SYSTEM_${extProj}})
81-
#-----------------------------------------------------------------------------
82-
# Ensure all generator info is passed to external library build
83-
#-----------------------------------------------------------------------------
84-
set (COMMON_CMAKE_EP_ARGS
85-
CMAKE_GENERATOR ${CMAKE_GENERATOR}
86-
CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
87-
CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
88-
)
8981

9082
imstk_define_external_dirs( ${extProj} )
9183

@@ -98,7 +90,6 @@ macro(imstk_add_external_project extProj)
9890
BINARY_DIR ${${extProj}_BINARY_DIR} # from above or parsed argument
9991
TMP_DIR ${${extProj}_TMP_DIR} # from above
10092
STAMP_DIR ${${extProj}_STAMP_DIR} # from above
101-
${COMMON_CMAKE_EP_ARGS} # from above
10293
${${extProj}_EP_ARGS} # from ExternalProject_Include_Dependencies
10394
${${extProj}_UNPARSED_ARGUMENTS} # from unparsed arguments of this macro
10495
DEPENDS ${${extProj}_DEPENDENCIES} # from parsed argument

0 commit comments

Comments
 (0)