New upstream version 5.0.0 (6ef96f12) · Commits · Debian Med / elastix

.editorconfig

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		# EditorConfig: https://EditorConfig.org

		# This is the top-most EditorConfig file
		root = true

		# Apply to any source file
		[.]

		# Indentation of two spaces
		indent_style = space
		indent_size = 2

+1 −0

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		language: cpp

		env:
		global:
		ELASTIX_SOURCE_DIR=${TRAVIS_BUILD_DIR}
		ELASTIX_BUILD_DIR=${HOME}/elastix-build
		ITK_URL=https://github.com/InsightSoftwareConsortium/ITK
		ITK_SOURCE_DIR=${HOME}/ITK-source
		ITK_BUILD_DIR=${HOME}/ITK-build
		OMP_NUM_THREADS=2

		cache:
		directories:
		- ${ITK_SOURCE_DIR}
		- ${ITK_BUILD_DIR}

		matrix:
		include:
		- os: linux
		dist: trusty
		sudo: required
		compiler: clang
		- os: linux
		dist: trusty
		sudo: required
		compiler: gcc
		- os: osx
		compiler: clang
		- os: osx
		compiler: gcc

		before_script:
		- mkdir -p ${ELASTIX_BUILD_DIR}

		script:
		- if [[ ! -e ${ITK_BUILD_DIR}/ITKConfig.cmake ]]; then
		rm -rf ${ITK_SOURCE_DIR} {ITK_BUILD_DIR} &&
		git clone ${ITK_URL} ${ITK_SOURCE_DIR} &&
		cd ${ITK_SOURCE_DIR} &&
		git checkout v4.11.1 &&
		mkdir -p ${ITK_BUILD_DIR} &&
		cd ${ITK_BUILD_DIR} &&
		cmake -DBUILD_EXAMPLES=OFF -DBUILD_TESTING:BOOL=OFF -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF -DITKGroup_IO:BOOL=ON -DModule_ITKDistanceMap:BOOL=ON -DModule_ITKImageFusion:BOOL=ON -DModule_ITKLabelMap:BOOL:=ON -DModule_ITKMathematicalMorphology:BOOL=ON -DModule_ITKOptimizers:BOOL=ON -DModule_ITKOptimizersv4:BOOL=ON -DModule_ITKRegistrationCommon:BOOL=ON -DModule_ITKVideoIO:BOOL=ON-DCMAKE_BUILD_TYPE=Release ${ITK_SOURCE_DIR} &&
		make --jobs=4 &&
		touch ${HOME}/built_cache; fi
		- if [[ ! -e ${HOME}/built_cache ]]; then
		cd ${ELASTIX_BUILD_DIR} &&
		cmake -DELASTIX_USE_OPENMP=OFF -DITK_DIR=${ITK_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release ${ELASTIX_SOURCE_DIR} &&
		make --jobs=4 &&
		ctest --jobs=4 --verbose; fi

0 → 100644

+437 −0

File added.

Preview size limit exceeded, changes collapsed.

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ function(elastix_export_target tgt)
		# Remove the build tree's ElastixTargets file if this is the first call:
		get_property(first_time GLOBAL PROPERTY ELASTIX_FIRST_EXPORTED_TARGET)
		if(NOT first_time)
		file(REMOVE ${CMAKE_BINARY_DIR}/ElastixTargets.cmake)
		file(REMOVE ${elastix_BINARY_DIR}/ElastixTargets.cmake)
		set_property(GLOBAL PROPERTY ELASTIX_FIRST_EXPORTED_TARGET 1)
		endif()

		@@ -17,6 +17,6 @@ function(elastix_export_target tgt)
		endif()

		export(TARGETS ${tgt}
		APPEND FILE "${CMAKE_BINARY_DIR}/ElastixTargets.cmake"
		APPEND FILE "${elastix_BINARY_DIR}/ElastixTargets.cmake"
		)
		endfunction()