Skip to content
Browse files

ENH: Updates for BRAINSTools and ITKv4

This is a set of updates to try to address reported
issues with 32bit windows builds related to the new
double-convert to ASCII functionality.

Worked with ITKv4 team (Bill Lorensen and Kent Williams mostly) to
add the DoubleConversion featues directly to ITKv4.  This simplyfies
adding this functionality to other tools (like BRAINSTools, Slicer,
ANTs, etc..), and also provides more extensive testing of ITKv4.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21839 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
1 parent 47ddd9b commit 2bd29bf6f7b5dcbf635a38b284a22de38ee04313 hjohnson committed
View
1 SuperBuild.cmake
@@ -296,7 +296,6 @@ endif()
if(Slicer_BUILD_BRAINSTOOLS)
list(APPEND ep_superbuild_extra_args -DBRAINSTools_SOURCE_DIR:PATH=${BRAINSTools_SOURCE_DIR})
- list(APPEND ep_superbuild_extra_args -DDoubleConvert_DIR:PATH=${DoubleConvert_DIR})
endif()
if(Slicer_BUILD_MultiVolumeExplorer)
View
4 SuperBuild/External_BRAINSTools.cmake
@@ -12,7 +12,7 @@ if(DEFINED BRAINSTools_SOURCE_DIR AND NOT EXISTS ${BRAINSTools_SOURCE_DIR})
endif()
# Set dependency list
-set(BRAINSTools_DEPENDENCIES ${ITK_EXTERNAL_NAME} SlicerExecutionModel VTK DoubleConvert)
+set(BRAINSTools_DEPENDENCIES ${ITK_EXTERNAL_NAME} SlicerExecutionModel VTK )
# Include dependent projects if any
SlicerMacroCheckExternalProjectDependency(BRAINSTools)
@@ -20,7 +20,7 @@ set(proj BRAINSTools)
if(NOT DEFINED BRAINSTools_SOURCE_DIR)
#message(STATUS "${__indent}Adding project ${proj}")
- set(GIT_TAG "49eda67a4bfc83dfff1ca1b102cc6281efaf6521" CACHE STRING "" FORCE)
+ set(GIT_TAG "3a2a1eea189de41bb071d85a1f0e0a2c8c9cdd2f" CACHE STRING "" FORCE)
if(NOT DEFINED git_protocol)
set(git_protocol "git")
View
4 SuperBuild/External_DCMTK.cmake
@@ -29,8 +29,8 @@ if(NOT DEFINED DCMTK_DIR)
"-DCMAKE_PROJECT_DCMTK_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake")
endif()
- set(DCMTK_REPOSITORY ${git_protocol}://github.com/commontk/DCMTK.git)
- set(DCMTK_GIT_TAG "d06e2b7d9bafb23df4e969482a68b50fc75aaaa9")
+ set(${proj}_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/DCMTK.git)
+ set(${proj}_GIT_TAG "257e800c42f40ff3207a9242fa225c850c56dd07")
ExternalProject_Add(${proj}
GIT_REPOSITORY ${DCMTK_REPOSITORY}
View
69 SuperBuild/External_DoubleConvert.cmake
@@ -1,69 +0,0 @@
-
-# Make sure this file is included only once by creating globally unique varibles
-# based on the name of this included file.
-get_filename_component(CMAKE_CURRENT_LIST_FILENAME ${CMAKE_CURRENT_LIST_FILE} NAME_WE)
-if(${CMAKE_CURRENT_LIST_FILENAME}_FILE_INCLUDED)
- return()
-endif()
-set(${CMAKE_CURRENT_LIST_FILENAME}_FILE_INCLUDED 1)
-
-# Sanity checks
-if(DEFINED DoubleConvert_DIR AND NOT EXISTS ${DoubleConvert_DIR})
- message(FATAL_ERROR "DoubleConvert_DIR variable is defined but corresponds to non-existing directory")
-endif()
-
-# Set dependency list
-set(DoubleConvert_DEPENDENCIES "")
-
-# Include dependent projects if any
-SlicerMacroCheckExternalProjectDependency(DoubleConvert)
-set(proj DoubleConvert)
-
-
-if(NOT DEFINED "DoubleConvert_DIR")
- #message(STATUS "${__indent}Adding project ${proj}")
-
- # 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 git_protocol)
- set(git_protocol "git")
- endif()
-
- set(${proj}_CMAKE_OPTIONS
- -DBUILD_TESTING:BOOL=OFF
- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/${proj}-install
- )
-
- set(${proj}_REPOSITORY ${git_protocol}://github.com/BRAINSia/double-conversion.git)
- set(${proj}_GIT_TAG 4acac6d49232d1822b19d4dd79f1477656757156)
- ExternalProject_Add(${proj}
- GIT_REPOSITORY ${${proj}_REPOSITORY}
- GIT_TAG ${${proj}_GIT_TAG}
- "${${PROJECT_NAME}_EP_UPDATE_IF_GREATER_288}"
- SOURCE_DIR ${proj}
- BINARY_DIR ${proj}-build
- CMAKE_GENERATOR ${gen}
- CMAKE_ARGS
- -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
- -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS:STRING=${ep_common_c_flags}
- ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
- ${${proj}_CMAKE_OPTIONS}
- # INSTALL_COMMAND "" # Limit the number of include paths bu installing the project
- DEPENDS
- ${${proj}_DEPENDENCIES}
- )
- set(${proj}_DIR ${CMAKE_BINARY_DIR}/${proj}-install/lib/CMake/double-conversion)
-else()
- # The project is provided using ${extProjName}_DIR, nevertheless since other
- # project may depend on ${extProjName}, let's add an 'empty' one
- SlicerMacroEmptyExternalProject(${proj} "${${proj}_DEPENDENCIES}")
-endif()
View
4 SuperBuild/External_ITKv4.cmake
@@ -37,7 +37,7 @@ if(NOT DEFINED ITK_DIR)
if(Slicer_BUILD_DICOM_SUPPORT)
set(ITKv4_DCMTK_ARGS
-DITK_USE_SYSTEM_DCMTK:BOOL=ON
- -DDCMTK_DIR:PATH=${DCMTK_DIR}
+ -DDCMTK_DIR:PATH=${DCMTK_DIR}/share/dcmtk
-DModule_ITKIODCMTK:BOOL=ON
)
endif()
@@ -75,7 +75,7 @@ if(NOT DEFINED ITK_DIR)
endif()
set(ITKv4_REPOSITORY ${git_protocol}://itk.org/ITK.git)
- set(ITKv4_GIT_TAG 8978a8e56de129a0717fe7806353682b7f776aef) #2013-03-08 Provide const correct API
+ set(ITKv4_GIT_TAG 55ba0bf6511dda626877e0f3e7a69ee02a41d4e9) #2013-03-24 Use version with DoubleConversion included
ExternalProject_Add(${proj}
GIT_REPOSITORY ${ITKv4_REPOSITORY}

0 comments on commit 2bd29bf

Please sign in to comment.
Something went wrong with that request. Please try again.