Commit c9270428 authored by jcfr's avatar jcfr
Browse files

STYLE: Fix style and indent in external project definition

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20651 3bd1e089-480b-0410-8dfb-8563597acbee
parent 8195044c
......@@ -18,15 +18,6 @@ set(BRAINSTools_DEPENDENCIES ${ITK_EXTERNAL_NAME} SlicerExecutionModel VTK )
SlicerMacroCheckExternalProjectDependency(BRAINSTools)
set(proj BRAINSTools)
# Set CMake OSX variable to pass down the external project
#set(CMAKE_OSX_EXTERNAL_PROJECT_ARGS)
#if(APPLE)
# list(APPEND CMAKE_OSX_EXTERNAL_PROJECT_ARGS
# -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
# -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
# -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET})
#endif()
if(NOT DEFINED BRAINSTools_SOURCE_DIR)
#message(STATUS "${__indent}Adding project ${proj}")
if(${ITK_VERSION_MAJOR} STREQUAL "3")
......
......@@ -54,4 +54,3 @@ ExternalProject_Add(${proj}
)
set(BatchMake_DIR ${CMAKE_BINARY_DIR}/BatchMake-build)
......@@ -101,4 +101,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${CTK_DEPENDENCIES}")
endif()
......@@ -45,4 +45,3 @@ if(Slicer_USE_CTKAPPLAUNCHER)
endif()
endif()
......@@ -44,4 +44,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${ChangeTrackerPy_DEPENDENCIES}")
endif()
......@@ -39,4 +39,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${EMSegment_DEPENDENCIES}")
endif()
......@@ -76,4 +76,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${ITKv3_DEPENDENCIES}")
endif()
......@@ -88,4 +88,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${LibArchive_DEPENDENCIES}")
endif()
......@@ -44,4 +44,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${MultiVolumeExplorer_DEPENDENCIES}")
endif()
# Make sure this file is included only once
get_filename_component(CMAKE_CURRENT_LIST_FILENAME ${CMAKE_CURRENT_LIST_FILE} NAME_WE)
if(${CMAKE_CURRENT_LIST_FILENAME}_FILE_INCLUDED)
......@@ -43,4 +44,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${MultiVolumeImporter_DEPENDENCIES}")
endif()
......@@ -56,4 +56,3 @@ ExternalProject_Add(${proj}
DEPENDS
${NUMPY_DEPENDENCIES}
)
......@@ -47,4 +47,3 @@ ExternalProject_Add(${proj}
)
set(OpenIGTLink_DIR ${CMAKE_BINARY_DIR}/OpenIGTLink-build)
......@@ -41,4 +41,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${OpenIGTLinkIF_DEPENDENCIES}")
endif()
......@@ -22,15 +22,15 @@ SlicerMacroCheckExternalProjectDependency(PCRE)
#
# follow the standard EP_PREFIX locations
set ( pcre_binary_dir ${CMAKE_CURRENT_BINARY_DIR}/PCRE-prefix/src/PCRE-build )
set ( pcre_source_dir ${CMAKE_CURRENT_BINARY_DIR}/PCRE-prefix/src/PCRE )
set ( pcre_install_dir ${CMAKE_CURRENT_BINARY_DIR}/PCRE )
set(pcre_binary_dir ${CMAKE_CURRENT_BINARY_DIR}/PCRE-prefix/src/PCRE-build)
set(pcre_source_dir ${CMAKE_CURRENT_BINARY_DIR}/PCRE-prefix/src/PCRE)
set(pcre_install_dir ${CMAKE_CURRENT_BINARY_DIR}/PCRE)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild/pcre_configure_step.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/pcre_configure_step.cmake
@ONLY)
set ( pcre_CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/pcre_configure_step.cmake )
set(pcre_CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/pcre_configure_step.cmake)
ExternalProject_add(PCRE
URL http://downloads.sourceforge.net/project/pcre/pcre/8.12/pcre-8.12.tar.gz
......@@ -38,4 +38,3 @@ ExternalProject_add(PCRE
"${slicer_external_update}"
CONFIGURE_COMMAND ${pcre_CONFIGURE_COMMAND}
)
......@@ -25,4 +25,3 @@ ExternalProject_Add(${proj}
DEPENDS
${SciPy_DEPENDENCIES}
)
......@@ -78,4 +78,4 @@ ExternalProject_add(SimpleITK
INSTALL_COMMAND ${SimpleITK_INSTALL_COMMAND}
#
DEPENDS ${SimpleITK_DEPENDENCIES}
)
)
......@@ -71,4 +71,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${SlicerExecutionModel_DEPENDENCIES}")
endif()
# Make sure this file is included only once
get_filename_component(CMAKE_CURRENT_LIST_FILENAME ${CMAKE_CURRENT_LIST_FILE} NAME_WE)
if(${CMAKE_CURRENT_LIST_FILENAME}_FILE_INCLUDED)
......@@ -43,4 +44,3 @@ else()
# let's add an 'empty' one
SlicerMacroEmptyExternalProject(${proj} "${SlicerWebGLExport_DEPENDENCIES}")
endif()
......@@ -39,15 +39,14 @@ if(NOT SWIG_DIR)
#
# swig uses bison find it by cmake and pass it down
find_package ( BISON )
set ( BISON_FLAGS "" CACHE STRING "Flags used by bison" )
mark_as_advanced ( BISON_FLAGS )
find_package(BISON)
set(BISON_FLAGS "" CACHE STRING "Flags used by bison")
mark_as_advanced(BISON_FLAGS)
# follow the standard EP_PREFIX locations
set ( swig_binary_dir ${CMAKE_CURRENT_BINARY_DIR}/Swig-prefix/src/Swig-build )
set ( swig_source_dir ${CMAKE_CURRENT_BINARY_DIR}/Swig-prefix/src/Swig )
set ( swig_install_dir ${CMAKE_CURRENT_BINARY_DIR}/Swig )
set(swig_binary_dir ${CMAKE_CURRENT_BINARY_DIR}/Swig-prefix/src/Swig-build)
set(swig_source_dir ${CMAKE_CURRENT_BINARY_DIR}/Swig-prefix/src/Swig)
set(swig_install_dir ${CMAKE_CURRENT_BINARY_DIR}/Swig)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild/swig_configure_step.cmake.in
......@@ -66,4 +65,4 @@ if(NOT SWIG_DIR)
set(SWIG_EXECUTABLE ${swig_install_dir}/bin/swig)
set(Swig_DEPEND Swig)
endif()
endif(NOT SWIG_DIR)
endif()
......@@ -46,4 +46,3 @@ ExternalProject_Add(weave
DEPENDS
${weave_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