From 7bec4392bdbf269ac70a709ab527a1e6a3368654 Mon Sep 17 00:00:00 2001
From: Romain Garrigues <romain.garrigues@c-s.fr>
Date: Fri, 30 Jun 2006 14:10:37 +0000
Subject: [PATCH] Modifications pour make install ITK
---
Utilities/ITK/Code/Algorithms/CMakeLists.txt | 4 ++--
Utilities/ITK/Code/BasicFilters/CMakeLists.txt | 4 ++--
Utilities/ITK/Code/Common/CMakeLists.txt | 4 ++--
Utilities/ITK/Code/IO/CMakeLists.txt | 4 ++--
Utilities/ITK/Code/Numerics/CMakeLists.txt | 4 ++--
Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt | 4 ++--
Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt | 2 +-
Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt | 4 ++--
Utilities/ITK/Code/Patented/CMakeLists.txt | 2 +-
Utilities/ITK/Code/SpatialObject/CMakeLists.txt | 4 ++--
Utilities/ITK/Utilities/CMakeLists.txt | 6 +++---
Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt | 6 +++---
Utilities/ITK/Utilities/MetaIO/CMakeLists.txt | 4 ++--
Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt | 4 ++--
Utilities/ITK/Utilities/expat/CMakeLists.txt | 4 ++--
Utilities/ITK/Utilities/gdcm/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt | 4 ++--
Utilities/ITK/Utilities/itkjpeg/12/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/itkjpeg/16/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/itkjpeg/8/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/nifti/CMakeLists.txt | 8 +++++---
Utilities/ITK/Utilities/openjpeg/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/png/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/tiff/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/vxl/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/vxl/core/CMakeLists.txt | 3 ++-
Utilities/ITK/Utilities/vxl/core/testlib/CMakeLists.txt | 3 ++-
Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt | 5 +++--
Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt | 5 +++--
Utilities/ITK/Utilities/vxl/core/vnl/io/CMakeLists.txt | 3 ++-
Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt | 2 +-
Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt | 5 +++--
Utilities/ITK/Utilities/zlib/CMakeLists.txt | 6 +++---
34 files changed, 65 insertions(+), 57 deletions(-)
diff --git a/Utilities/ITK/Code/Algorithms/CMakeLists.txt b/Utilities/ITK/Code/Algorithms/CMakeLists.txt
index 8cdf506318..08ad977725 100644
--- a/Utilities/ITK/Code/Algorithms/CMakeLists.txt
+++ b/Utilities/ITK/Code/Algorithms/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Code/BasicFilters/CMakeLists.txt b/Utilities/ITK/Code/BasicFilters/CMakeLists.txt
index 0425aa7819..3f60531d16 100644
--- a/Utilities/ITK/Code/BasicFilters/CMakeLists.txt
+++ b/Utilities/ITK/Code/BasicFilters/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Code/Common/CMakeLists.txt b/Utilities/ITK/Code/Common/CMakeLists.txt
index 0d5909f354..82b7eafe46 100644
--- a/Utilities/ITK/Code/Common/CMakeLists.txt
+++ b/Utilities/ITK/Code/Common/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Code/IO/CMakeLists.txt b/Utilities/ITK/Code/IO/CMakeLists.txt
index c7bf1ceb40..edf4508878 100644
--- a/Utilities/ITK/Code/IO/CMakeLists.txt
+++ b/Utilities/ITK/Code/IO/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Code/Numerics/CMakeLists.txt b/Utilities/ITK/Code/Numerics/CMakeLists.txt
index a56fbeb696..a697f68b5e 100644
--- a/Utilities/ITK/Code/Numerics/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt b/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt
index e7da0a3797..17aa640c95 100644
--- a/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt b/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt
index 3230606db2..00b40cc77d 100644
--- a/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt
@@ -1 +1 @@
-INSTALL_FILES(/include/InsightToolkit/Numerics/NeuralNetworks "(\\.h|\\.txx)$")
+INSTALL_FILES(/include/otb/Utilities/ITK/Numerics/NeuralNetworks "(\\.h|\\.txx)$")
diff --git a/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt b/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt
index bccce71715..90d25c4b5a 100644
--- a/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Code/Patented/CMakeLists.txt b/Utilities/ITK/Code/Patented/CMakeLists.txt
index 5bd4250570..aafd2bb34c 100644
--- a/Utilities/ITK/Code/Patented/CMakeLists.txt
+++ b/Utilities/ITK/Code/Patented/CMakeLists.txt
@@ -1 +1 @@
-INSTALL_FILES(/include/InsightToolkit/Patented "(\\.h|\\.txx)$")
+INSTALL_FILES(/include/otb/Utilities/ITK/Patented "(\\.h|\\.txx)$")
diff --git a/Utilities/ITK/Code/SpatialObject/CMakeLists.txt b/Utilities/ITK/Code/SpatialObject/CMakeLists.txt
index da0dce4d2c..833c2793c4 100644
--- a/Utilities/ITK/Code/SpatialObject/CMakeLists.txt
+++ b/Utilities/ITK/Code/SpatialObject/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Utilities/CMakeLists.txt b/Utilities/ITK/Utilities/CMakeLists.txt
index 010101451a..264d669e00 100644
--- a/Utilities/ITK/Utilities/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/CMakeLists.txt
@@ -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")
diff --git a/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt b/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt
index aae14f0324..fae202b3fa 100644
--- a/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt b/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt
index b6b988064b..8f06305939 100644
--- a/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt
@@ -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})
diff --git a/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt b/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt
index 91ea3f1073..6141e74e4b 100644
--- a/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt
@@ -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)$")
diff --git a/Utilities/ITK/Utilities/expat/CMakeLists.txt b/Utilities/ITK/Utilities/expat/CMakeLists.txt
index 3db954eaf4..d089d772d8 100644
--- a/Utilities/ITK/Utilities/expat/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/expat/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/gdcm/CMakeLists.txt b/Utilities/ITK/Utilities/gdcm/CMakeLists.txt
index 1c73a4124b..36dc92f64b 100644
--- a/Utilities/ITK/Utilities/gdcm/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/gdcm/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt b/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt
index d7ddb2c078..1526450b20 100644
--- a/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt
@@ -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
diff --git a/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt b/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt
index e550ca6a12..60528ca16b 100644
--- a/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/itkjpeg/12/CMakeLists.txt b/Utilities/ITK/Utilities/itkjpeg/12/CMakeLists.txt
index 88b7d1fd29..1cecf58100 100644
--- a/Utilities/ITK/Utilities/itkjpeg/12/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itkjpeg/12/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/itkjpeg/16/CMakeLists.txt b/Utilities/ITK/Utilities/itkjpeg/16/CMakeLists.txt
index a769a9e255..c96b3417a2 100644
--- a/Utilities/ITK/Utilities/itkjpeg/16/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itkjpeg/16/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/itkjpeg/8/CMakeLists.txt b/Utilities/ITK/Utilities/itkjpeg/8/CMakeLists.txt
index 2e3717267b..2d2bf985c8 100644
--- a/Utilities/ITK/Utilities/itkjpeg/8/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itkjpeg/8/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/nifti/CMakeLists.txt b/Utilities/ITK/Utilities/nifti/CMakeLists.txt
index c45f77239d..cbca031440 100644
--- 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/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)
diff --git a/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt b/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt
index 517b94f3ae..243d850a48 100644
--- a/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/png/CMakeLists.txt b/Utilities/ITK/Utilities/png/CMakeLists.txt
index ccf7c17247..6b2bbc600d 100644
--- a/Utilities/ITK/Utilities/png/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/png/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/tiff/CMakeLists.txt b/Utilities/ITK/Utilities/tiff/CMakeLists.txt
index 2c23e78ec9..a06bbc997b 100644
--- a/Utilities/ITK/Utilities/tiff/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/tiff/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/vxl/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/CMakeLists.txt
index 872ac59a55..d46ab25324 100644
--- a/Utilities/ITK/Utilities/vxl/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/vxl/core/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/core/CMakeLists.txt
index db1222cf7f..fe55d687b6 100644
--- a/Utilities/ITK/Utilities/vxl/core/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/core/CMakeLists.txt
@@ -7,7 +7,8 @@ SET(global_sources
)
# common test executable
-SUBDIRS(testlib)
+# ROMAIN
+#SUBDIRS(testlib)
# numerics
SUBDIRS(vnl)
diff --git a/Utilities/ITK/Utilities/vxl/core/testlib/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/core/testlib/CMakeLists.txt
index 2d732332db..1d06dab81c 100644
--- a/Utilities/ITK/Utilities/vxl/core/testlib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/core/testlib/CMakeLists.txt
@@ -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 )
diff --git a/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt
index 5838b9f1dd..ff507bb250 100644
--- a/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt
index 0309f887f2..a60ede7771 100644
--- a/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/vxl/core/vnl/io/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/core/vnl/io/CMakeLists.txt
index 96461c579d..3a3cc15427 100644
--- a/Utilities/ITK/Utilities/vxl/core/vnl/io/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/core/vnl/io/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt
index 2be5478806..dfe2635cc7 100644
--- a/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt
@@ -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)
diff --git a/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt
index 5db6d563a9..2249e29d83 100644
--- a/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt
@@ -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"
diff --git a/Utilities/ITK/Utilities/zlib/CMakeLists.txt b/Utilities/ITK/Utilities/zlib/CMakeLists.txt
index 665d4d0f7f..cf9e0e825c 100644
--- a/Utilities/ITK/Utilities/zlib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/zlib/CMakeLists.txt
@@ -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)$")
--
GitLab