Commit a10fa3c8 authored by jcfr's avatar jcfr
Browse files

COMP: Make sure Update command is disabled using CMake < 2.8.9

While commit r20834 allowed Slicer to be configured using CMake 2.8.9, it
also prevented the UPDATE_COMMAND from being disabled using version < 2.8.9.

This commit revert it and fix the issue by re setting LOG_UPDATE 1

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20836 3bd1e089-480b-0410-8dfb-8563597acbee
parent 7f54a463
......@@ -45,7 +45,7 @@ include(SlicerMacroCheckExternalProjectDependency)
if(CMAKE_VERSION VERSION_LESS 2.8.9)
set(slicer_external_update UPDATE_COMMAND "")
else()
set(slicer_external_update)
set(slicer_external_update LOG_UPDATE 1)
endif()
set(ep_base "${CMAKE_BINARY_DIR}")
......
......@@ -33,7 +33,7 @@ endif()
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/BRAINSia/BRAINSStandAlone.git"
GIT_TAG "${GIT_TAG}"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -30,7 +30,7 @@ endif()
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://batchmake.org/BatchMake.git"
GIT_TAG "1f5bf4f92e8678c34dc6f7558be5e6613804d988"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR BatchMake
BINARY_DIR BatchMake-build
CMAKE_GENERATOR ${gen}
......
......@@ -67,7 +67,7 @@ if(NOT DEFINED CTK_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/commontk/CTK.git"
GIT_TAG "eacf36d3fd547bb67e7b212c46107e220eb2f6a9"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -30,7 +30,7 @@ if(Slicer_USE_CTKAPPLAUNCHER)
ExternalProject_Add(${proj}
URL http://cloud.github.com/downloads/commontk/AppLauncher/CTKAppLauncher-${launcher_version}-${CTKAPPLAUNCHER_OS}-${CTKAPPLAUNCHER_ARCHITECTURE}.tar.gz
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
${slicer_external_update}
"${slicer_external_update}"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
......
......@@ -28,7 +28,7 @@ if(NOT DEFINED ChangeTrackerPy_SOURCE_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/fedorov/ChangeTrackerPy.git"
GIT_TAG "68b70e15ada3b46742ab3374a62e3eb02a5d101a"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -32,7 +32,7 @@ if(NOT DEFINED DCMTK_DIR)
SOURCE_DIR ${proj}
BINARY_DIR ${proj}-build
INSTALL_DIR ${proj}-install
${slicer_external_update}
"${slicer_external_update}"
CMAKE_GENERATOR ${gen}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
......
......@@ -23,7 +23,7 @@ if(NOT DEFINED EMSegment_SOURCE_DIR)
ExternalProject_Add(${proj}
SVN_REPOSITORY "http://svn.slicer.org/Slicer3/trunk/Modules/EMSegment"
SVN_REVISION -r "17011"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -42,7 +42,7 @@ if(NOT DEFINED ITK_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://${${CMAKE_PROJECT_NAME}_${proj}_GIT_REPOSITORY}"
GIT_TAG ${${CMAKE_PROJECT_NAME}_${proj}_GIT_TAG}
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -78,7 +78,7 @@ if(NOT DEFINED ITK_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY ${ITKv4_REPOSITORY}
GIT_TAG ${ITKv4_GIT_TAG}
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -62,7 +62,7 @@ if(NOT DEFINED LibArchive_DIR)
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
INSTALL_DIR LibArchive-install
${slicer_external_update}
"${slicer_external_update}"
CMAKE_GENERATOR ${gen}
CMAKE_ARGS
# Not used -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
......
......@@ -28,7 +28,7 @@ if(NOT DEFINED MultiVolumeExplorer_SOURCE_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/fedorov/MultiVolumeExplorer.git"
GIT_TAG "bdb0af5cd7ef3609d04736af15fe6281c032fd25"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -28,7 +28,7 @@ if(NOT DEFINED MultiVolumeImporter_SOURCE_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/fedorov/MultiVolumeImporter.git"
GIT_TAG "2a2c65d11b4a1d65be00e91e41acec1a200aab06"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
......@@ -46,7 +46,7 @@ ExternalProject_Add(${proj}
DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/NUMPY
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/NUMPY
${slicer_external_update}
"${slicer_external_update}"
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-P ${CMAKE_CURRENT_BINARY_DIR}/${proj}_configure_step.cmake
BUILD_COMMAND ${CMAKE_COMMAND}
......
......@@ -27,7 +27,7 @@ endif()
ExternalProject_Add(${proj}
SVN_REPOSITORY "http://svn.na-mic.org/NAMICSandBox/trunk/OpenIGTLink"
SVN_REVISION -r "7701"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR OpenIGTLink
BINARY_DIR OpenIGTLink-build
CMAKE_GENERATOR ${gen}
......
......@@ -23,7 +23,7 @@ if(NOT DEFINED OpenIGTLinkIF_SOURCE_DIR)
ExternalProject_Add(${proj}
SVN_REPOSITORY "http://svn.na-mic.org/NAMICSandBox/trunk/IGTLoadableModules/QtModules/OpenIGTLinkIF/"
SVN_REVISION -r "7909"
${slicer_external_update}
"${slicer_external_update}"
#GIT_REPOSITORY "${git_protocol}://github.com/Slicer/OpenIGTLinkIF.git"
#GIT_TAG "8330b769cc8c607067134296d577b64ae7c92b87"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
......
......@@ -35,6 +35,6 @@ set(pcre_CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/pcre_
ExternalProject_add(PCRE
URL http://downloads.sourceforge.net/project/pcre/pcre/8.12/pcre-8.12.tar.gz
URL_MD5 fa69e4c5d8971544acd71d1f10d59193
${slicer_external_update}
"${slicer_external_update}"
CONFIGURE_COMMAND ${pcre_CONFIGURE_COMMAND}
)
......@@ -17,7 +17,7 @@ set(proj SciPy)
ExternalProject_Add(${proj}
SVN_REPOSITORY "http://svn.scipy.org/svn/scipy/branches/0.7.x"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR python/scipy
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
......
......@@ -50,7 +50,7 @@ ExternalProject_add(SimpleITK
GIT_REPOSITORY http://itk.org/SimpleITK.git
# This is the tag for the "master" branch as of June 8th, 2012
GIT_TAG 9465b2d518ce39db24d770cff4095c27f6556249 # 2012-07-23
${slicer_external_update}
"${slicer_external_update}"
CMAKE_ARGS
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
......
......@@ -37,7 +37,7 @@ if(NOT DEFINED SlicerExecutionModel_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/Slicer/SlicerExecutionModel.git"
GIT_TAG "b6125d3f5f29f7395fee060a0a0bb04409818ad4"
${slicer_external_update}
"${slicer_external_update}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
CMAKE_GENERATOR ${gen}
......
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