diff --git a/CMakeExternals/Eigen.cmake b/CMakeExternals/Eigen.cmake index 260174db3d..51bed8d519 100644 --- a/CMakeExternals/Eigen.cmake +++ b/CMakeExternals/Eigen.cmake @@ -1,41 +1,42 @@ #----------------------------------------------------------------------------- # Eigen #----------------------------------------------------------------------------- if(MITK_USE_Eigen) # Sanity checks if(DEFINED Eigen_DIR AND NOT EXISTS ${Eigen_DIR}) message(FATAL_ERROR "Eigen_DIR variable is defined but corresponds to non-existing directory") endif() set(proj Eigen) set(proj_DEPENDENCIES ) set(Eigen_DEPENDS ${proj}) if(NOT DEFINED Eigen_DIR) ExternalProject_Add(${proj} LIST_SEPARATOR ${sep} URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/eigen-eigen-07105f7124f9.tar.bz2 URL_MD5 9e3bfaaab3db18253cfd87ea697b3ab1 + PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/Eigen.patch CMAKE_ARGS ${ep_common_args} -DBUILD_TESTING:BOOL=ON -DEIGEN_BUILD_PKGCONFIG:BOOL=OFF CMAKE_CACHE_ARGS ${ep_common_cache_args} CMAKE_CACHE_DEFAULT_ARGS ${ep_common_cache_default_args} ) set(Eigen_DIR ${ep_prefix}) mitkFunctionInstallExternalCMakeProject(${proj}) else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") endif() endif() diff --git a/CMakeExternals/Eigen.patch b/CMakeExternals/Eigen.patch new file mode 100644 index 0000000000..688fde68e2 --- /dev/null +++ b/CMakeExternals/Eigen.patch @@ -0,0 +1,16 @@ +--- a/cmake/EigenConfigureTesting.cmake 2016-02-16 08:26:15.000000000 -0500 ++++ b/cmake/EigenConfigureTesting.cmake 2016-06-09 16:49:26.074261584 -0400 +@@ -14,13 +14,6 @@ + # check whether /bin/bash exists + find_file(EIGEN_BIN_BASH_EXISTS "/bin/bash" PATHS "/" NO_DEFAULT_PATH) + +-# CMake/Ctest does not allow us to change the build command, +-# so we have to workaround by directly editing the generated DartConfiguration.tcl file +-# save CMAKE_MAKE_PROGRAM +-set(CMAKE_MAKE_PROGRAM_SAVE ${CMAKE_MAKE_PROGRAM}) +-# and set a fake one +-set(CMAKE_MAKE_PROGRAM "@EIGEN_MAKECOMMAND_PLACEHOLDER@") +- + # This call activates testing and generates the DartConfiguration.tcl + include(CTest) +