Commit ee7ac49f authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

Merge branch 'ConfigFix' into 'master'

BUG: iMSTK no longer overwrites the CMAKE_MODULE_PATH in its config

Closes #336

See merge request iMSTK/iMSTK!624
parents 0a8d18c1 1054c22d
......@@ -16,7 +16,8 @@ set(iMSTK_BUILD_TESTING @iMSTK_BUILD_TESTING@)
set(iMSTK_USE_PHYSX @iMSTK_USE_PHYSX@)
# Use the iMSTK modules to find all required packages
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
set(CACHE_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
include(${CMAKE_CURRENT_LIST_DIR}/modules/imstkFind.cmake)
include(CMakeFindDependencyMacro)
set(CMAKE_DEBUG_POSTFIX @CMAKE_DEBUG_POSTFIX@)
......@@ -125,4 +126,5 @@ find_dependency(VTK COMPONENTS
find_dependency(VTK COMPONENTS ${VTK_DEPENDENCIES})
if(iMSTK_USE_VTK_OSMESA)
add_definitions(-DiMSTK_USE_VTK_OSMESA)
endif()
\ No newline at end of file
endif()
set(CMAKE_MODULE_PATH ${CACHE_CMAKE_MODULE_PATH})
\ No newline at end of file
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