Merge pull request #50 from SuperElastix/develop

RELEASE: merging develop into master

.gitignore

@@ -0,0 +1,39 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Generated files and
+help/
+cmake*
+Makefile
+CMakeFiles/
+CTestTestfile.cmake

.travis.yml

@@ -2,12 +2,11 @@ language: cpp
 
 env:
   global:
-    HOME_DIR=${TRAVIS_BUILD_DIR}/..
     ELASTIX_SOURCE_DIR=${TRAVIS_BUILD_DIR}
-    ELASTIX_BUILD_DIR=${HOME_DIR}/elastix-build
+    ELASTIX_BUILD_DIR=${HOME}/elastix-build
     ITK_URL=https://github.com/InsightSoftwareConsortium/ITK
-    ITK_SOURCE_DIR=${HOME_DIR}/ITK-source
-    ITK_BUILD_DIR=${HOME_DIR}/ITK-build
+    ITK_SOURCE_DIR=${HOME}/ITK-source
+    ITK_BUILD_DIR=${HOME}/ITK-build
     OMP_NUM_THREADS=2
 
 cache:
@@ -41,11 +40,11 @@ script:
       git checkout v4.11.1 &&
       mkdir -p ${ITK_BUILD_DIR} &&
       cd ${ITK_BUILD_DIR} &&
-      cmake -DBUILD_EXAMPLES=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} &&
+      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_DIR}/built_cache ]]; then
+  - if [[ ! -e ${HOME}/built_cache ]]; then
       cd ${ELASTIX_BUILD_DIR} &&
-      cmake -DITK_DIR=${ITK_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release ${ELASTIX_SOURCE_DIR} &&
+      cmake -DELASTIX_USE_OPENMP=OFF -DITK_DIR=${ITK_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release ${ELASTIX_SOURCE_DIR} &&
       make --jobs=4 && 
-      ctest --jobs=4; fi
+      ctest --jobs=4 --verbose; fi

CMake/elastixExportTarget.cmake

@@ -0,0 +1,22 @@
+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)
+    set_property(GLOBAL PROPERTY ELASTIX_FIRST_EXPORTED_TARGET 1)
+  endif()
+
+  get_target_property( type ${tgt} TYPE )
+  if (type STREQUAL "STATIC_LIBRARY" OR
+      type STREQUAL "MODULE_LIBRARY" OR
+      type STREQUAL "SHARED_LIBRARY")
+    set_property(TARGET ${tgt} PROPERTY VERSION 1)
+    set_property(TARGET ${tgt} PROPERTY SOVERSION 1)
+    set_property(TARGET ${tgt} PROPERTY
+      OUTPUT_NAME ${tgt}-${ELASTIX_VERSION_MAJOR}.${ELASTIX_VERSION_MINOR})
+  endif()
+
+  export(TARGETS ${tgt}
+    APPEND FILE "${CMAKE_BINARY_DIR}/ElastixTargets.cmake"
+  )
+endfunction()