Commit 35be5f31 authored by jcfr's avatar jcfr
Browse files

STYLE: Superbuild - Added missing DEPENDS properties in External_* files

The DEPENDS property is also now consistently added as the last property
of the external project description.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@13822 3bd1e089-480b-0410-8dfb-8563597acbee
parent 3a9dc11f
......@@ -309,6 +309,7 @@ configure_file(
# Establish Target Dependencies based on Selected Options
#------------------------------------------------------------------------------
set(tcl_DEPENDENCIES)
set(tk_DEPENDENCIES tcl)
set(incrTcl_DEPENDENCIES tcl tk)
set(iwidgets_DEPENDENCIES tcl itcl)
......
......@@ -5,7 +5,6 @@
set(proj BatchMake)
ExternalProject_Add(${proj}
DEPENDS ${BatchMake_DEPENDENCIES}
CVS_REPOSITORY ":pserver:anoncvs:@batchmake.org:/cvsroot/BatchMake"
CVS_MODULE "BatchMake"
SOURCE_DIR BatchMake
......@@ -21,4 +20,6 @@ ExternalProject_Add(${proj}
-DUSE_SPLASHSCREEN:BOOL=OFF
-DITK_DIR:FILEPATH=${ITK_DIR}
INSTALL_COMMAND ""
DEPENDS
${BatchMake_DEPENDENCIES}
)
......@@ -27,8 +27,9 @@ ExternalProject_Add(CLAPACK
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS_CLAPACK}
-DBUILD_SHARED_LIBS:BOOL=OFF
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
INSTALL_COMMAND ""
DEPENDS ${CLAPACK_DEPENDENCIES}
INSTALL_COMMAND ""
DEPENDS
${CLAPACK_DEPENDENCIES}
)
set(CLAPACK_DIR "${CLAPACK_binary}" CACHE PATH
"CLAPACK binary directory" FORCE)
......
......@@ -32,7 +32,8 @@ if (Slicer3_USE_QT)
-DCTK_PLUGIN_org.commontk.eventbus:BOOL=OFF
-Dgit_EXECUTABLE:FILEPATH=${git_EXECUTABLE}
INSTALL_COMMAND ""
DEPENDS ${CTK_DEPENDENCIES}
DEPENDS
${CTK_DEPENDENCIES}
)
set(CTK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
......@@ -46,7 +47,8 @@ if (Slicer3_USE_QT)
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
DEPENDS ${CTK_DEPENDENCIES}
DEPENDS
${CTK_DEPENDENCIES}
)
endif()
endif()
......@@ -37,7 +37,8 @@ if(NOT DEFINED ITK_DIR)
-DBUILD_TESTING:BOOL=OFF
-DITK_LEGACY_REMOVE:BOOL=ON
INSTALL_COMMAND ""
DEPENDS ${Insight_DEPENDENCIES}
DEPENDS
${Insight_DEPENDENCIES}
)
set(ITK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
......@@ -51,6 +52,7 @@ else()
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
DEPENDS ${Insight_DEPENDENCIES}
DEPENDS
${Insight_DEPENDENCIES}
)
endif()
......@@ -6,7 +6,6 @@ set(proj KWWidgets)
set(kwwidgets_tag Slicer-3-6)
ExternalProject_Add(${proj}
DEPENDS ${KWWidgets_DEPENDENCIES}
CVS_REPOSITORY ":pserver:anoncvs@www.kwwidgets.org:/cvsroot/KWWidgets"
CVS_MODULE "KWWidgets"
CVS_TAG -r ${kwwidgets_tag}
......@@ -26,4 +25,6 @@ ExternalProject_Add(${proj}
-DKWWidgets_BUILD_TESTING:BOOL=OFF
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
INSTALL_COMMAND ""
DEPENDS
${KWWidgets_DEPENDENCIES}
)
......@@ -30,7 +30,7 @@ ExternalProject_Add(NUMPY
BUILD_COMMAND ${CMAKE_COMMAND}
-P ${CMAKE_CURRENT_BINARY_DIR}/NUMPY_make_step.cmake
UPDATE_COMMAND ""
INSTALL_COMMAND ""
DEPENDS
${NUMPY_DEPENDENCIES}
INSTALL_COMMAND ""
)
......@@ -18,4 +18,6 @@ ExternalProject_Add(${proj}
-DOpenIGTLink_PROTOCOL_VERSION_2:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
INSTALL_COMMAND ""
DEPENDS
${OpenIGTLink_DEPENDENCIES}
)
......@@ -39,9 +39,9 @@ if(WIN32)
CONFIGURE_COMMAND ${CMAKE_BUILD_TOOL} ${python_sln} /Upgrade
BUILD_COMMAND ${CMAKE_BUILD_TOOL} ${python_sln} /build Release /project select
BUILD_IN_SOURCE 1
INSTALL_COMMAND ""
DEPENDS
${python_DEPENDENCIES}
INSTALL_COMMAND ""
)
if(Slicer3_USE_KWWIDGETS)
......@@ -143,9 +143,9 @@ elseif(UNIX)
CONFIGURE_COMMAND ${python_CONFIGURE_COMMAND}
BUILD_COMMAND ${python_BUILD_COMMAND}
UPDATE_COMMAND ""
INSTALL_COMMAND ${python_INSTALL_COMMAND}
DEPENDS
${python_DEPENDENCIES}
INSTALL_COMMAND ${python_INSTALL_COMMAND}
)
if(APPLE)
......
......@@ -8,5 +8,6 @@ ExternalProject_Add(${proj}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
DEPENDS ${scipy_DEPENDENCIES}
DEPENDS
${scipy_DEPENDENCIES}
)
......@@ -53,4 +53,6 @@ ExternalProject_Add(${proj}
CONFIGURE_COMMAND ${tcl_CONFIGURE_COMMAND}
BUILD_COMMAND ${tcl_BUILD_COMMAND}
INSTALL_COMMAND ${tcl_INSTALL_COMMAND}
DEPENDS
${tcl_DEPENDENCIES}
)
......@@ -40,7 +40,6 @@ endif()
if(NOT WIN32)
ExternalProject_Add(${proj}
DEPENDS ${tk_DEPENDENCIES}
SVN_REPOSITORY ${tk_SVN_REPOSITORY}
SOURCE_DIR ${tk_SOURCE_DIR}
UPDATE_COMMAND ""
......@@ -48,6 +47,8 @@ if(NOT WIN32)
CONFIGURE_COMMAND ${tk_CONFIGURE_COMMAND}
BUILD_COMMAND ${tk_BUILD_COMMAND}
INSTALL_COMMAND ${tk_INSTALL_COMMAND}
DEPENDS
${tk_DEPENDENCIES}
)
ExternalProject_Add_Step(${proj} Install_default.h
......
......@@ -141,7 +141,8 @@ if(NOT DEFINED VTK_DIR OR NOT DEFINED VTK_SOURCE_DIR)
${VTK_QT_ARGS}
${VTK_MAC_ARGS}
INSTALL_COMMAND ""
DEPENDS ${VTK_DEPENDENCIES}
DEPENDS
${VTK_DEPENDENCIES}
)
set(VTK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
set(VTK_SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj})
......@@ -156,6 +157,7 @@ else()
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
DEPENDS ${VTK_DEPENDENCIES}
DEPENDS
${VTK_DEPENDENCIES}
)
endif()
......@@ -53,7 +53,6 @@ if (UNIX)
endif()
ExternalProject_Add(${proj}
DEPENDS ${blt_DEPENDENCIES}
SVN_REPOSITORY ${blt_SVN}
SOURCE_DIR tcl/blt
BUILD_IN_SOURCE ${blt_BUILD_IN_SOURCE}
......@@ -61,6 +60,8 @@ if (UNIX)
CONFIGURE_COMMAND ${blt_CONFIGURE}
BUILD_COMMAND ${blt_BUILD}
INSTALL_COMMAND ${blt_INSTALL}
DEPENDS
${blt_DEPENDENCIES}
)
if(APPLE)
......
......@@ -15,4 +15,6 @@ ExternalProject_Add(${proj}
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
INSTALL_COMMAND ""
DEPENDS
${cmcurl_DEPENDENCIES}
)
......@@ -35,7 +35,6 @@ endif()
if(NOT WIN32)
ExternalProject_Add(${proj}
DEPENDS ${incrTcl_DEPENDENCIES}
SVN_REPOSITORY ${itcl_SVN_REPOSITORY}
SOURCE_DIR tcl/incrTcl
BUILD_IN_SOURCE ${itcl_BUILD_IN_SOURCE}
......@@ -43,6 +42,8 @@ if(NOT WIN32)
CONFIGURE_COMMAND ${itcl_CONFIGURE_COMMAND}
BUILD_COMMAND ${itcl_BUILD_COMMAND}
INSTALL_COMMAND ${itcl_INSTALL_COMMAND}
DEPENDS
${incrTcl_DEPENDENCIES}
)
ExternalProject_Add_Step(${proj} CHMOD_incrTcl_configure
......
......@@ -15,12 +15,13 @@ if(NOT WIN32)
set(iwidgets_INSTALL make install)
ExternalProject_Add(${proj}
DEPENDS ${iwidgets_DEPENDENCIES}
SVN_REPOSITORY ${iwidgets_SVN}
SOURCE_DIR tcl/iwidgets
BUILD_IN_SOURCE ${iwidgets_BUILD_IN_SOURCE}
CONFIGURE_COMMAND ${iwidgets_CONFIGURE}
BUILD_COMMAND ${iwidgets_BUILD}
INSTALL_COMMAND ${iwidgets_INSTALL}
DEPENDS
${iwidgets_DEPENDENCIES}
)
endif()
......@@ -18,7 +18,6 @@ endif()
ExternalProject_Add(${proj}
SVN_REPOSITORY "http://teem.svn.sourceforge.net/svnroot/teem/teem/tags/1.10.0"
UPDATE_COMMAND ""
DEPENDS ${teem_DEPENDENCIES}
SOURCE_DIR teem
BINARY_DIR teem-build
CMAKE_GENERATOR ${gen}
......@@ -44,4 +43,6 @@ ExternalProject_Add(${proj}
-DPNG_LIBRARY:FILEPATH=${teem_PNG_LIBRARY}
-DTeem_USE_LIB_INSTALL_SUBDIR:BOOL=ON
INSTALL_COMMAND ""
DEPENDS
${teem_DEPENDENCIES}
)
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