diff --git a/CMakeExternals/CTK.cmake b/CMakeExternals/CTK.cmake index 96409df2ca..c328933ed7 100644 --- a/CMakeExternals/CTK.cmake +++ b/CMakeExternals/CTK.cmake @@ -1,38 +1,45 @@ #----------------------------------------------------------------------------- # CTK #----------------------------------------------------------------------------- IF(MITK_USE_CTK) # Sanity checks IF(DEFINED CTK_DIR AND NOT EXISTS ${CTK_DIR}) MESSAGE(FATAL_ERROR "CTK_DIR variable is defined but corresponds to non-existing directory") ENDIF() SET(proj CTK) SET(proj_DEPENDENCIES ) SET(CTK_DEPENDS ${proj}) IF(NOT DEFINED CTK_DIR) + + SET(revision_tag e80497a32aadaf2099f7) + IF(${proj}_REVISION_TAG) + SET(revision_tag ${${proj}_REVISION_TAG}) + ENDIF() + ExternalProject_Add(${proj} GIT_REPOSITORY git://github.com/commontk/CTK.git - GIT_TAG f6c3e844ffedbac6f3139265fbdd19c979e44152 + GIT_TAG ${revision_tag} BINARY_DIR ${proj}-build + UPDATE_COMMAND "" INSTALL_COMMAND "" CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} -DDESIRED_QT_VERSION:STRING=4 -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DCTK_LIB_DICOM/Widgets:BOOL=ON DEPENDS ${proj_DEPENDENCIES} ) SET(CTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) ELSE() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") ENDIF() ENDIF() diff --git a/CMakeExternals/MITKData.cmake b/CMakeExternals/MITKData.cmake index c9cbbbfa40..e937a1c10d 100644 --- a/CMakeExternals/MITKData.cmake +++ b/CMakeExternals/MITKData.cmake @@ -1,33 +1,39 @@ #----------------------------------------------------------------------------- # MITK Data #----------------------------------------------------------------------------- # Sanity checks IF(DEFINED MITK_DATA_DIR AND NOT EXISTS ${MITK_DATA_DIR}) MESSAGE(FATAL_ERROR "MITK_DATA_DIR variable is defined but corresponds to non-existing directory") ENDIF() SET(proj MITK-Data) SET(proj_DEPENDENCIES) SET(MITK-Data_DEPENDS ${proj}) IF(BUILD_TESTING) + SET(revision_tag 4fa450c29ebd819419) + IF(${proj}_REVISION_TAG) + SET(revision_tag ${${proj}_REVISION_TAG}) + ENDIF() + ExternalProject_Add(${proj} GIT_REPOSITORY http://git.mitk.org/MITK-Data.git - GIT_TAG "origin/master" + GIT_TAG ${revision_tag} + UPDATE_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" DEPENDS ${proj_DEPENDENCIES} ) SET(MITK_DATA_DIR ${ep_source_dir}/${proj}) ELSE() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") ENDIF(BUILD_TESTING)