Commit 7bec4392 authored by Romain Garrigues's avatar Romain Garrigues

Modifications pour make install ITK

parent 51e1f5a1
......@@ -27,5 +27,5 @@ ENDIF(USE_SCSL)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKAlgorithms PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKAlgorithms)
INSTALL_FILES(/include/InsightToolkit/Algorithms "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKAlgorithms)
INSTALL_FILES(/include/otb/Utilities/ITK/Algorithms "(\\.h|\\.txx)$")
......@@ -3,5 +3,5 @@ TARGET_LINK_LIBRARIES(ITKBasicFilters ITKCommon)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKBasicFilters PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKBasicFilters)
INSTALL_FILES(/include/InsightToolkit/BasicFilters "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKBasicFilters)
INSTALL_FILES(/include/otb/Utilities/ITK/BasicFilters "(\\.h|\\.txx)$")
......@@ -181,5 +181,5 @@ IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKCommon PROPERTIES ${ITK_LIBRARY_PROPERTIES})
SET_TARGET_PROPERTIES(itkvnl_inst PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKCommon itkvnl_inst)
INSTALL_FILES(/include/InsightToolkit/Common "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKCommon itkvnl_inst)
INSTALL_FILES(/include/otb/Utilities/ITK/Common "(\\.h|\\.txx)$")
......@@ -83,5 +83,5 @@ ITKniftiio)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKIO PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKIO)
INSTALL_FILES(/include/InsightToolkit/IO "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKIO)
INSTALL_FILES(/include/otb/Utilities/ITK/IO "(\\.h|\\.txx)$")
......@@ -38,5 +38,5 @@ TARGET_LINK_LIBRARIES(ITKNumerics ITKCommon)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKNumerics PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKNumerics)
INSTALL_FILES(/include/InsightToolkit/Numerics "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKNumerics)
INSTALL_FILES(/include/otb/Utilities/ITK/Numerics "(\\.h|\\.txx)$")
......@@ -191,5 +191,5 @@ ENDIF(UNIX)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKFEM PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKFEM)
INSTALL_FILES(/include/InsightToolkit/Numerics/FEM "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKFEM)
INSTALL_FILES(/include/otb/Utilities/ITK/Numerics/FEM "(\\.h|\\.txx)$")
INSTALL_FILES(/include/InsightToolkit/Numerics/NeuralNetworks "(\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/ITK/Numerics/NeuralNetworks "(\\.h|\\.txx)$")
......@@ -10,5 +10,5 @@ TARGET_LINK_LIBRARIES(ITKStatistics ITKCommon)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKStatistics PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKStatistics)
INSTALL_FILES(/include/InsightToolkit/Numerics/Statistics "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKStatistics)
INSTALL_FILES(/include/otb/Utilities/ITK/Numerics/Statistics "(\\.h|\\.txx)$")
INSTALL_FILES(/include/InsightToolkit/Patented "(\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/ITK/Patented "(\\.h|\\.txx)$")
......@@ -9,5 +9,5 @@ TARGET_LINK_LIBRARIES(ITKSpatialObject ITKNumerics ITKCommon ITKMetaIO)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKSpatialObject PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKSpatialObject)
INSTALL_FILES(/include/InsightToolkit/SpatialObject "(\\.h|\\.txx)$")
INSTALL_TARGETS(/lib/otb ITKSpatialObject)
INSTALL_FILES(/include/otb/Utilities/ITK/SpatialObject "(\\.h|\\.txx)$")
......@@ -59,8 +59,8 @@ SET(KWSYS_USE_DynamicLoader 1)
SET(KWSYS_USE_Glob 1)
SET(KWSYS_USE_Registry 1)
SET(KWSYS_HEADER_ROOT ${ITK_BINARY_DIR}/Utilities)
SET(KWSYS_LIBRARY_INSTALL_DIR /lib/InsightToolkit)
SET(KWSYS_HEADER_INSTALL_DIR /include/InsightToolkit/Utilities)
SET(KWSYS_LIBRARY_INSTALL_DIR /lib/otb)
SET(KWSYS_HEADER_INSTALL_DIR /include/otb/Utilities/ITK/Utilities)
SET(KWSYS_PROPERTIES_CXX ${ITK_LIBRARY_PROPERTIES})
SUBDIRS(kwsys)
......@@ -73,5 +73,5 @@ ENDIF(ITK_BUILD_CABLESWIG)
#-----------------------------------------------------------------------------
# Install the UseITK.cmake file configured from the top-level.
INSTALL_FILES(/lib/InsightToolkit ".cmake" "ITKConfig")
INSTALL_FILES(/lib/otb ".cmake" "ITKConfig")
......@@ -59,7 +59,7 @@ ADD_LIBRARY(${DICOMPARSER_LIBRARY} DICOMSource.cxx DICOMBuffer.cxx DICOMFile.cxx
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(${DICOMPARSER_LIBRARY} PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ${DICOMPARSER_LIBRARY})
INSTALL_FILES(/include/InsightToolkit "(\\.h|\\.txx)$")
INSTALL_FILES(/include/InsightToolkit FILES
INSTALL_TARGETS(/lib/otb ${DICOMPARSER_LIBRARY})
INSTALL_FILES(/include/otb/Utilities/ITK "(\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/ITK FILES
${PROJECT_BINARY_DIR}/DICOMCMakeConfig.h)
......@@ -31,6 +31,6 @@ ADD_LIBRARY(ITKMetaIO
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKMetaIO PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKMetaIO)
INSTALL_FILES(/include/InsightToolkit/Utilities/MetaIO "(\\.h)$")
INSTALL_TARGETS(/lib/otb ITKMetaIO)
INSTALL_FILES(/include/otb/Utilities/ITK/Utilities/MetaIO "(\\.h)$")
TARGET_LINK_LIBRARIES(ITKMetaIO ${ITK_ZLIB_LIBRARIES})
......@@ -61,6 +61,6 @@ TARGET_LINK_LIBRARIES(ITKNrrdIO ${ITK_ZLIB_LIBRARIES} )
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKNrrdIO PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKNrrdIO)
INSTALL_FILES(/include/InsightToolkit/Utilities/NrrdIO "(\\.h)$")
INSTALL_TARGETS(/lib/otb ITKNrrdIO)
INSTALL_FILES(/include/otb/Utilities/ITK/Utilities/NrrdIO "(\\.h)$")
......@@ -24,5 +24,5 @@ ADD_LIBRARY(ITKEXPAT ${expat_SRCS})
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(ITKEXPAT PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ITKEXPAT)
INSTALL_FILES(/include/InsightToolkit/expat .h expat expatDllConfig)
INSTALL_TARGETS(/lib/otb ITKEXPAT)
INSTALL_FILES(/include/otb/Utilities/ITK/expat .h expat expatDllConfig)
......@@ -147,5 +147,5 @@ ENDIF (WIN32)
CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
INSTALL_FILES(/include/InsightToolkit/gdcm/src .h gdcmConfigure.h)
INSTALL_FILES(/include/otb/Utilities/ITK/gdcm/src .h gdcmConfigure.h)
......@@ -107,7 +107,7 @@ CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in"
"${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE)
#-----------------------------------------------------------------------------
INSTALL_FILES(/include/InsightToolkit/gdcm/Dicts .dic
INSTALL_FILES(/include/otb/Utilities/ITK/gdcm/Dicts .dic
dicomV3
dicomVR
dicomTS
......
......@@ -79,8 +79,8 @@ IF(CMAKE_SYSTEM MATCHES "SunOS.*")
TARGET_LINK_LIBRARIES(itkgdcm socket nsl)
ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
INSTALL_FILES(/include/InsightToolkit/gdcm/src "\\.h$")
INSTALL_FILES(/include/otb/Utilities/ITK/gdcm/src "\\.h$")
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkgdcm PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkgdcm)
INSTALL_TARGETS(/lib/otb itkgdcm)
......@@ -7,6 +7,6 @@ ADD_LIBRARY(itkjpeg12 ${JPEG_SOURCES})
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkjpeg12 PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkjpeg12)
INSTALL_TARGETS(/lib/otb itkjpeg12)
......@@ -7,6 +7,6 @@ ADD_LIBRARY(itkjpeg16 ${JPEG_SOURCES})
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkjpeg16 PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkjpeg16)
INSTALL_TARGETS(/lib/otb itkjpeg16)
......@@ -7,5 +7,5 @@ ADD_LIBRARY(itkjpeg8 ${JPEG_SOURCES})
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkjpeg8 PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkjpeg8)
INSTALL_TARGETS(/lib/otb itkjpeg8)
......@@ -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/InsightToolkit")
SET(INCLUDE_INSTALL_DIR "/include/InsightToolkit")
SET(LIB_INSTALL_DIR "/lib/otb")
SET(INCLUDE_INSTALL_DIR "/include/otb/Utilities/ITK")
SET(NIFTI_ZLIB_LIBRARIES ${ITK_ZLIB_LIBRARIES})
ELSE("${ITK_VERSION_MAJOR}" GREATER 0.0)
### USE AS STAND ALONE PACKAGE
......@@ -25,6 +25,8 @@ ELSE("${ITK_VERSION_MAJOR}" GREATER 0.0)
SET(INCLUDE_INSTALL_DIR "/include")
#Needs an if clause and more work before testing can take place.
SUBDIRS(Testing utils fsliolib examples)
#ROMAIN
#SUBDIRS(Testing utils fsliolib examples)
SUBDIRS(utils fsliolib examples)
ENABLE_TESTING()
ENDIF("${ITK_VERSION_MAJOR}" GREATER 0.0)
......@@ -41,5 +41,5 @@ ADD_LIBRARY(${OPJ_PREFIX}openjpeg ${OpenJPEG_SRCS})
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(${OPJ_PREFIX}openjpeg PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit ${OPJ_PREFIX}openjpeg)
INSTALL_TARGETS(/lib/otb ${OPJ_PREFIX}openjpeg)
......@@ -38,4 +38,4 @@ ENDIF(UNIX)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkpng PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkpng)
INSTALL_TARGETS(/lib/otb itkpng)
......@@ -153,4 +153,4 @@ ENDIF(UNIX)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itktiff PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itktiff)
INSTALL_TARGETS(/lib/otb itktiff)
......@@ -23,4 +23,4 @@ SET(VCL_INCLUDE_DIR ${vxl_BINARY_DIR}/vcl ${vxl_SOURCE_DIR}/vcl)
INCLUDE_DIRECTORIES(${VCL_INCLUDE_DIR} ${VXLCORE_INCLUDE_DIR})
SET(VXL_INSTALL_ROOT /include/InsightToolkit/Utilities/vxl)
SET(VXL_INSTALL_ROOT /include/otb/Utilities/ITK/Utilities/vxl)
......@@ -7,7 +7,8 @@ SET(global_sources
)
# common test executable
SUBDIRS(testlib)
# ROMAIN
#SUBDIRS(testlib)
# numerics
SUBDIRS(vnl)
......
......@@ -25,5 +25,6 @@ ADD_LIBRARY( itktestlib ${testlib_sources} )
TARGET_LINK_LIBRARIES( itktestlib itkvcl )
IF( BUILD_TESTING )
SUBDIRS( tests )
#ROMAIN
# SUBDIRS( tests )
ENDIF( BUILD_TESTING )
......@@ -197,12 +197,13 @@ TARGET_LINK_LIBRARIES( itkvnl itkvcl )
SUBDIRS(algo)
IF( BUILD_TESTING )
SUBDIRS(tests)
# ROMAIN
# SUBDIRS(tests)
ENDIF( BUILD_TESTING )
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkvnl PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkvnl)
INSTALL_TARGETS(/lib/otb itkvnl)
INSTALL_FILES(${VXL_INSTALL_ROOT}/core/vnl "(\\.h|\\.txx)$")
INSTALL_FILES(${VXL_INSTALL_ROOT}/core/vnl .h vnl_config)
......@@ -86,10 +86,11 @@ IF(NETLIB_FOUND)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkvnl_algo PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkvnl_algo)
INSTALL_TARGETS(/lib/otb itkvnl_algo)
IF( BUILD_TESTING )
SUBDIRS(tests)
# ROMAIN
# SUBDIRS(tests)
ENDIF( BUILD_TESTING )
ENDIF(NETLIB_FOUND)
......
......@@ -29,5 +29,6 @@ ADD_LIBRARY(vnl_io ${vnl_io_sources} )
TARGET_LINK_LIBRARIES( vnl_io vnl vsl )
IF(BUILD_TESTING)
SUBDIRS(tests)
#ROMAIN
# SUBDIRS(tests)
ENDIF(BUILD_TESTING)
......@@ -310,4 +310,4 @@ ENDIF(UNIX)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itknetlib PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itknetlib)
INSTALL_TARGETS(/lib/otb itknetlib)
......@@ -359,13 +359,14 @@ ENDIF(UNIX)
# INCLUDE( ${vxl_SOURCE_DIR}/vcl/LinkSTLPort.cmake )
IF( BUILD_TESTING)
SUBDIRS(tests)
#ROMAIN
# SUBDIRS(tests)
ENDIF( BUILD_TESTING)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkvcl PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkvcl)
INSTALL_TARGETS(/lib/otb itkvcl)
INSTALL_FILES(${VXL_INSTALL_ROOT}/vcl "(\\.h|\\.txx)$")
INSTALL_FILES(${VXL_INSTALL_ROOT}/vcl ".h"
"vcl_config_compiler"
......
......@@ -38,7 +38,7 @@ ADD_LIBRARY(itkzlib ${ZLIB_SRCS})
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkzlib PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
INSTALL_TARGETS(/lib/InsightToolkit itkzlib)
INSTALL_FILES(${VXL_INSTALL_ROOT}/include/InsightToolkit/Utilities/zlib ".h" zlibDllConfig)
INSTALL_FILES(/include/InsightToolkit/Utilities/zlib "(\\.h)$")
INSTALL_TARGETS(/lib/otb itkzlib)
INSTALL_FILES(${VXL_INSTALL_ROOT}/include/otb/Utilities/ITK/Utilities/zlib ".h" zlibDllConfig)
INSTALL_FILES(/include/otb/Utilities/ITK/Utilities/zlib "(\\.h)$")
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