Commit eabb6dbf authored by Aaron Bray's avatar Aaron Bray
Browse files

Add back CMake updates lost on this branch

parent 286bc276
......@@ -78,6 +78,14 @@ macro(imstk_add_external_project extProj)
# If needs to download and build
#-----------------------------------------------------------------------------
if(NOT DEFINED ${extProj}_DIR AND NOT ${USE_SYSTEM_${extProj}})
#-----------------------------------------------------------------------------
# Ensure all generator info is passed to external library build
#-----------------------------------------------------------------------------
set (COMMON_CMAKE_EP_ARGS
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
)
imstk_define_external_dirs( ${extProj} )
......@@ -90,6 +98,7 @@ macro(imstk_add_external_project extProj)
BINARY_DIR ${${extProj}_BINARY_DIR} # from above or parsed argument
TMP_DIR ${${extProj}_TMP_DIR} # from above
STAMP_DIR ${${extProj}_STAMP_DIR} # from above
${COMMON_CMAKE_EP_ARGS} # from above
${${extProj}_EP_ARGS} # from ExternalProject_Include_Dependencies
${${extProj}_UNPARSED_ARGUMENTS} # from unparsed arguments of this macro
DEPENDS ${${extProj}_DEPENDENCIES} # from parsed argument
......
Supports Markdown
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