Mise à jour ITK version 2.8.1

05246986 · Romain Garrigues · 5c4ad551 · 05246986 · 05246986 · 05246986
Commit 05246986 authored 18 years ago by Romain Garrigues
--- a/Utilities/ITK/Utilities/nifti/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/nifti/CMakeLists.txt
@@ -12,8 +12,8 @@ ADD_DEFINITIONS(-DHAVE_ZLIB)
 IF("${ITK_VERSION_MAJOR}" GREATER 0.0)
 #   MESSAGE(STATUS "---------------------ITK ZLIB  ${ITK_ZLIB_LIBRARIES}")
  SET(PACKAGE_PREFIX "ITK")
-  SET(LIB_INSTALL_DIR "/lib/otb")
-  SET(INCLUDE_INSTALL_DIR "/include/otb/Utilities/ITK")
+  SET(LIB_INSTALL_DIR "/lib/InsightToolkit")
+  SET(INCLUDE_INSTALL_DIR "/include/InsightToolkit")
  SET(NIFTI_ZLIB_LIBRARIES ${ITK_ZLIB_LIBRARIES})
 ELSE("${ITK_VERSION_MAJOR}" GREATER 0.0)
 ###  USE AS STAND ALONE PACKAGE

--- a/Utilities/ITK/Utilities/nifti/examples/Makefile
+++ b/Utilities/ITK/Utilities/nifti/examples/Makefile
-CC	=	gcc
-CFLAGS	=	-ansi -pedantic
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.2

-FSLIO_INCS	=	-I../include
-NIFTI_INCS	=	-I../include
-ZNZ_INCS	=	-I/usr/include
+#=============================================================================
+# Set environment variables for the build.

-FSLIO_LIBS	=	-L../lib -lfslio
-NIFTI_LIBS	=	-L../lib -lniftiio
-ZNZ_LIBS	=	-L/usr/lib -L../lib -lznz -lm -lz
+# The shell in which to execute make rules.
+SHELL = /bin/sh

+# The CMake executable.
+CMAKE_COMMAND = /usr/local/bin/cmake

+# The command to remove a file.
+RM = /usr/local/bin/cmake -E remove -f

-## SGI 32bit
-ifeq ($(ARCH),SGI)
-ZNZ_INCS	=	-I/usr/freeware/include
-ZNZ_LIBS	=	-L/usr/freeware/lib32 -L../lib -lznz -lm -lz
-endif
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake

+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB

-## Redhat Fedora Linux
-##ZNZ_INCS	=	-I/usr/include
-##ZNZ_LIBS	=	-L/usr/lib -L../lib -lznz -lm -lz
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB

+#=============================================================================
+# Special targets provided by cmake.

+# Default target executed when no arguments are given to make.
+default_target: all

+# Special rule to drive testing with ctest.
+test:
+	@echo "Running tests..."
+	/usr/local/bin/ctest $(ARGS)

-all:	fsl_api_driver
+# Special rule to run installation script.
+install: all
+	$(CMAKE_COMMAND) -P cmake_install.cmake

+# Special rule to re-run CMake using make.
+rebuild_cache:
+	@echo "Running CMake to regenerate build system..."
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+
+# Special rule to re-run CMake cache editor using make.
+edit_cache:
+	@echo "Running CMake cache editor..."
+	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# Disable implicit rules so canoncical targets will work.
+.SUFFIXES:
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# The main all target
+all:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/examples/directorystart
+
+# The main clean target
 clean:
-	rm -f fsl_api_driver
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/examples/clean
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+
+# Convenience name for target.
+Utilities/ITK/Utilities/nifti/examples/CMakeFiles/fsl_api_driver.dir/rule:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/examples/CMakeFiles/fsl_api_driver.dir/rule
+
+# Convenience name for target.
+fsl_api_driver: Utilities/ITK/Utilities/nifti/examples/CMakeFiles/fsl_api_driver.dir/rule
+
+# target for object file
+fsl_api_driver.o:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f Utilities/ITK/Utilities/nifti/examples/CMakeFiles/fsl_api_driver.dir/build.make Utilities/ITK/Utilities/nifti/examples/CMakeFiles/fsl_api_driver.dir/fsl_api_driver.o
+
+# Help Target
+help::
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... install"
+	@echo "... rebuild_cache"
+	@echo "... fsl_api_driver"
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.

-fsl_api_driver:	fsl_api_driver.c ../lib/libfslio.a
-	$(CC) $(CFLAGS) -o fsl_api_driver fsl_api_driver.c $(FSLIO_INCS) $(NIFTI_INCS) $(ZNZ_INCS) $(FSLIO_LIBS) $(NIFTI_LIBS) $(ZNZ_LIBS)
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0

-help:
-	@echo "all:      make the fsl_api_driver program"
-	@echo "clean:    rm the fsl_api_driver program"
--- a/Utilities/ITK/Utilities/nifti/fsliolib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/nifti/fsliolib/CMakeLists.txt
@@ -8,5 +8,8 @@ SET(FSLIOLIB_SRC fslio.c)
 ADD_LIBRARY(${PACKAGE_PREFIX}fslio ${FSLIOLIB_SRC} )
 TARGET_LINK_LIBRARIES( ${PACKAGE_PREFIX}fslio ${PACKAGE_PREFIX}niftiio)

+IF(ITK_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(${PACKAGE_PREFIX}fslio PROPERTIES ${ITK_LIBRARY_PROPERTIES})
+ENDIF(ITK_LIBRARY_PROPERTIES)
 INSTALL_TARGETS(/lib ${PACKAGE_PREFIX}fslio)
 INSTALL_FILES(/include "(\\.h)$")
--- a/Utilities/ITK/Utilities/nifti/fsliolib/Makefile
+++ b/Utilities/ITK/Utilities/nifti/fsliolib/Makefile
-include ../Makefile
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.2

+#=============================================================================
+# Set environment variables for the build.

-PROJNAME = fslio
+# The shell in which to execute make rules.
+SHELL = /bin/sh

-INCFLAGS = $(ZLIB_INC) $(ZNZ_INC) $(NIFTI_INC)
-LIBS = $(ZLIB_LIBS) $(ZNZ_LIBS) $(NIFTI_LIBS) $(FSL_LIBS)
+# The CMake executable.
+CMAKE_COMMAND = /usr/local/bin/cmake

-SRCS=fslio.c
-OBJS=fslio.o
+# The command to remove a file.
+RM = /usr/local/bin/cmake -E remove -f

-SCRIPTS = remove_ext fsloutputtype imtest imglob imcp imln imrm immv
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake

+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB

+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB

-depend:	
-	$(RM) -f depend.mk
-	$(MAKE) depend.mk
+#=============================================================================
+# Special targets provided by cmake.

-depend.mk:
-	$(CC) $(DEPENDFLAGS) $(INCFLAGS) $(SRCS) >> depend.mk
+# Default target executed when no arguments are given to make.
+default_target: all

-lib: libfslio.a
+# Special rule to drive testing with ctest.
+test:
+	@echo "Running tests..."
+	/usr/local/bin/ctest $(ARGS)

-libfslio.a: ${OBJS}
-	${AR} -r libfslio.a ${OBJS}
+# Special rule to run installation script.
+install: all
+	$(CMAKE_COMMAND) -P cmake_install.cmake

+# Special rule to re-run CMake using make.
+rebuild_cache:
+	@echo "Running CMake to regenerate build system..."
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+
+# Special rule to re-run CMake cache editor using make.
+edit_cache:
+	@echo "Running CMake cache editor..."
+	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# Disable implicit rules so canoncical targets will work.
+.SUFFIXES:
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# The main all target
+all:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/fsliolib/directorystart
+
+# The main clean target
+clean:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/fsliolib/clean
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+
+# Convenience name for target.
+Utilities/ITK/Utilities/nifti/fsliolib/CMakeFiles/fslio.dir/rule:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/fsliolib/CMakeFiles/fslio.dir/rule
+
+# Convenience name for target.
+fslio: Utilities/ITK/Utilities/nifti/fsliolib/CMakeFiles/fslio.dir/rule
+
+# target for object file
+fslio.o:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f Utilities/ITK/Utilities/nifti/fsliolib/CMakeFiles/fslio.dir/build.make Utilities/ITK/Utilities/nifti/fsliolib/CMakeFiles/fslio.dir/fslio.o
+
+# Help Target
+help::
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... install"
+	@echo "... rebuild_cache"
+	@echo "... fslio"
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0

-include depend.mk
--- a/Utilities/ITK/Utilities/nifti/niftilib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/nifti/niftilib/CMakeLists.txt
@@ -12,5 +12,8 @@ IF(UNIX)
 TARGET_LINK_LIBRARIES(${PACKAGE_PREFIX}niftiio -lm)
 ENDIF(UNIX)

+IF(ITK_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(${PACKAGE_PREFIX}niftiio PROPERTIES ${ITK_LIBRARY_PROPERTIES})
+ENDIF(ITK_LIBRARY_PROPERTIES)
 INSTALL_TARGETS(${LIB_INSTALL_DIR} ${PACKAGE_PREFIX}niftiio)
 INSTALL_FILES(${INCLUDE_INSTALL_DIR} "(\\.h)$")
--- a/Utilities/ITK/Utilities/nifti/utils/Makefile
+++ b/Utilities/ITK/Utilities/nifti/utils/Makefile
-CC	=	gcc
-CFLAGS	=	-ansi -pedantic
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.2

-FSLIO_INCS	=	-I../include
-NIFTI_INCS	=	-I../include
-ZNZ_INCS	=	-I/usr/include
+#=============================================================================
+# Set environment variables for the build.

-FSLIO_LIBS	=	-L../lib -lfslio
-NIFTI_LIBS	=	-L../lib -lniftiio
-ZNZ_LIBS	=	-L/usr/lib -L../lib -lznz -lm -lz
+# The shell in which to execute make rules.
+SHELL = /bin/sh

+# The CMake executable.
+CMAKE_COMMAND = /usr/local/bin/cmake

+# The command to remove a file.
+RM = /usr/local/bin/cmake -E remove -f

-## SGI 32bit
-ifeq ($(ARCH),SGI)
-ZNZ_INCS	=	-I/usr/freeware/include
-ZNZ_LIBS	=	-L/usr/freeware/lib32 -L../lib -lznz -lm -lz
-endif
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake

+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB

+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB

-## Redhat Fedora Linux
-##ZNZ_INCS	=	-I/usr/include
-##ZNZ_LIBS	=	-L/usr/lib -L../lib -lznz -lm -lz
+#=============================================================================
+# Special targets provided by cmake.

+# Default target executed when no arguments are given to make.
+default_target: all

-UTILS_PROGS     =       nifti_stats nifti_tool nifti1_test
+# Special rule to drive testing with ctest.
+test:
+	@echo "Running tests..."
+	/usr/local/bin/ctest $(ARGS)

+# Special rule to run installation script.
+install: all
+	$(CMAKE_COMMAND) -P cmake_install.cmake

+# Special rule to re-run CMake using make.
+rebuild_cache:
+	@echo "Running CMake to regenerate build system..."
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

-all:	$(UTILS_PROGS)
+# Special rule to re-run CMake cache editor using make.
+edit_cache:
+	@echo "Running CMake cache editor..."
+	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# Disable implicit rules so canoncical targets will work.
+.SUFFIXES:
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# The main all target
+all:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/utils/directorystart
+
+# The main clean target
 clean:
-	rm -f $(UTILS_PROGS)
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/utils/clean
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+
+# Convenience name for target.
+Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti1_test.dir/rule:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti1_test.dir/rule
+
+# Convenience name for target.
+nifti1_test: Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti1_test.dir/rule
+
+# Convenience name for target.
+Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_stats.dir/rule:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_stats.dir/rule
+
+# Convenience name for target.
+nifti_stats: Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_stats.dir/rule
+
+# Convenience name for target.
+Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_tool.dir/rule:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f CMakeFiles/Makefile2 Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_tool.dir/rule
+
+# Convenience name for target.
+nifti_tool: Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_tool.dir/rule
+
+# target for object file
+nifti1_test.o:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti1_test.dir/build.make Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti1_test.dir/nifti1_test.o
+
+# target for object file
+nifti_stats.o:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_stats.dir/build.make Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_stats.dir/nifti_stats.o
+
+# target for object file
+nifti_tool.o:
+	cd /ORFEO/romain/ORFEO-TOOLBOX/otb/OTB && $(MAKE) -f Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_tool.dir/build.make Utilities/ITK/Utilities/nifti/utils/CMakeFiles/nifti_tool.dir/nifti_tool.o
+
+# Help Target
+help::
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... install"
+	@echo "... rebuild_cache"
+	@echo "... nifti1_test"
+	@echo "... nifti_stats"
+	@echo "... nifti_tool"
+


-nifti_stats: nifti_stats.c
-	$(CC) $(CFLAGS) -o nifti_stats nifti_stats.c $(NIFTI_INCS) $(ZNZ_INCS) $(NIFTI_LIBS) $(ZNZ_LIBS)
+#=============================================================================
+# Special targets to cleanup operation of make.

-nifti_tool: nifti_tool.c nifti_tool.h
-	$(CC) $(CFLAGS) -Wall -o nifti_tool nifti_tool.c $(NIFTI_INCS) $(ZNZ_INCS) $(NIFTI_LIBS) $(ZNZ_LIBS)
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0

-nifti1_test: nifti1_test.c
-	$(CC) $(CFLAGS) -o nifti1_test nifti1_test.c $(NIFTI_INCS) $(ZNZ_INCS) $(NIFTI_LIBS) $(ZNZ_LIBS)
--- a/Utilities/ITK/Utilities/nifti/znzlib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/nifti/znzlib/CMakeLists.txt
@@ -5,6 +5,9 @@ SET(ZNZLIB_SRC znzlib.c)

 ADD_LIBRARY(${PACKAGE_PREFIX}znz ${ZNZLIB_SRC} )
 TARGET_LINK_LIBRARIES( ${PACKAGE_PREFIX}znz ${NIFTI_ZLIB_LIBRARIES} )
+IF(ITK_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(${PACKAGE_PREFIX}znz PROPERTIES ${ITK_LIBRARY_PROPERTIES})
+ENDIF(ITK_LIBRARY_PROPERTIES)
 INSTALL_TARGETS(${LIB_INSTALL_DIR} ${PACKAGE_PREFIX}znz)
 INSTALL_FILES(${INCLUDE_INSTALL_DIR} "(\\.h)$")