Commit 1a31f3f6 authored by Julien Michel's avatar Julien Michel
Browse files

Mise à jour des commandes INSTALL_TARGETS et INSTALL_FILES (nouvelle syntaxe cmake).

parent 187a77bd
......@@ -5,5 +5,14 @@ FILE(GLOB OTBBasicFilters_SRCS "*.cxx" )
ADD_LIBRARY(OTBBasicFilters ${OTBBasicFilters_SRCS})
TARGET_LINK_LIBRARIES (OTBBasicFilters ITKCommon)
INSTALL_TARGETS(/lib/otb OTBBasicFilters )
INSTALL_FILES(/include/otb/BasicFilters "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBBasicFilters
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/BasicFilters
COMPONENT Development)
......@@ -5,5 +5,14 @@ FILE(GLOB OTBChangeDetection_SRCS "*.cxx" )
ADD_LIBRARY(OTBChangeDetection ${OTBChangeDetection_SRCS})
TARGET_LINK_LIBRARIES (OTBChangeDetection OTBCommon OTBIO ITKCommon)
INSTALL_TARGETS(/lib/otb OTBChangeDetection )
INSTALL_FILES(/include/otb/ChangeDetection "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBChangeDetection
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/ChangeDetection
COMPONENT Development)
......@@ -5,5 +5,15 @@ FILE(GLOB OTBCommon_SRCS "*.cxx" )
ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon)
INSTALL_TARGETS(/lib/otb OTBCommon )
INSTALL_FILES(/include/otb/Common "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBCommon
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Common
COMPONENT Development)
......@@ -5,5 +5,14 @@ FILE(GLOB OTBDisparityMap_SRCS "*.cxx" )
ADD_LIBRARY(OTBDisparityMap ${OTBDisparityMap_SRCS})
TARGET_LINK_LIBRARIES (OTBDisparityMap ITKCommon)
INSTALL_TARGETS(/lib/otb OTBDisparityMap )
INSTALL_FILES(/include/otb/DisparityMap "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBDisparityMap
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/DisparityMap
COMPONENT Development)
......@@ -6,5 +6,14 @@ FILE(GLOB OTBFeatureExtraction_SRCS "*.cxx" )
ADD_LIBRARY(OTBFeatureExtraction ${OTBFeatureExtraction_SRCS})
TARGET_LINK_LIBRARIES (OTBFeatureExtraction OTBCommon OTBIO ITKCommon ITKIO ITKAlgorithms)
INSTALL_TARGETS(/lib/otb OTBFeatureExtraction )
INSTALL_FILES(/include/otb/FeatureExtraction "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBFeatureExtraction
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/FeatureExtraction
COMPONENT Development)
......@@ -5,5 +5,14 @@ FILE(GLOB OTBGui_SRCS "*.cxx" )
ADD_LIBRARY(OTBGui ${OTBGui_SRCS})
TARGET_LINK_LIBRARIES (OTBGui ITKCommon)
INSTALL_TARGETS(/lib/otb OTBGui )
INSTALL_FILES(/include/otb/Gui "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBGui
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Gui
COMPONENT Development)
......@@ -5,5 +5,15 @@ FILE(GLOB OTBIO_SRCS "*.cxx" )
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon)
INSTALL_TARGETS(/lib/otb OTBIO )
INSTALL_FILES(/include/otb/IO "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBIO
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/IO
COMPONENT Development)
......@@ -6,5 +6,15 @@ FILE(GLOB OTBLearning_SRCS "*.cxx" )
ADD_LIBRARY(OTBLearning ${OTBLearning_SRCS})
TARGET_LINK_LIBRARIES (OTBLearning otbsvm OTBCommon OTBIO ITKCommon ITKIO)
INSTALL_TARGETS(/lib/otb OTBLearning )
INSTALL_FILES(/include/otb/Learning "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBLearning
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Learning
COMPONENT Development)
......@@ -5,5 +5,14 @@ FILE(GLOB OTBMultiScale_SRCS "*.cxx" )
ADD_LIBRARY(OTBMultiScale ${OTBMultiScale_SRCS})
TARGET_LINK_LIBRARIES (OTBMultiScale ITKCommon)
INSTALL_TARGETS(/lib/otb OTBMultiScale )
INSTALL_FILES(/include/otb/MultiScale "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBMultiScale
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/MultiScale
COMPONENT Development)
......@@ -5,5 +5,15 @@ FILE(GLOB OTBSpatialReasoning_SRCS "*.cxx" )
ADD_LIBRARY(OTBSpatialReasoning ${OTBSpatialReasoning_SRCS})
TARGET_LINK_LIBRARIES (OTBSpatialReasoning ITKCommon)
INSTALL_TARGETS(/lib/otb OTBSpatialReasoning )
INSTALL_FILES(/include/otb/SpatialReasoning "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBSpatialReasoning
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/SpatialReasoning
COMPONENT Development)
......@@ -5,5 +5,14 @@ FILE(GLOB OTBVisu_SRCS "*.cxx" )
ADD_LIBRARY(OTBVisu ${OTBVisu_SRCS})
TARGET_LINK_LIBRARIES (OTBVisu OTBGui ITKCommon OTBCommon ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES})
INSTALL_TARGETS(/lib/otb OTBVisu )
INSTALL_FILES(/include/otb/Visu "(\\.h|\\.txx)$")
INSTALL(TARGETS OTBVisu
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Visu
COMPONENT Development)
FILE(GLOB_RECURSE __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB_RECURSE __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
FILE(GLOB_RECURSE __files3 "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
INSTALL_FILES(/include/otb/Utilities/BGL/boost "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/bind "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/config "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/detail "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/function "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/functional "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/graph "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/iterator "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/mpl "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/optional "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/pending "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/preprocessor "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/spirit "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/tuple "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/type_traits "(\\.hpp|\\.h|\\.txx)$")
INSTALL_FILES(/include/otb/Utilities/BGL/boost/utility"(\\.hpp|\\.h|\\.txx)$")
INSTALL(FILES ${__files1} ${__files2} ${__files3}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/BGL/boost
COMPONENT Development)
FILE(GLOB_RECURSE ossim_HDRS "*.h")
INSTALL_FILES(/include/otb/Utilities/OSSIM/include/ "\\.h$" ${ossim_HDRS})
INSTALL(FILES ${ossim_HDRS}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/OSSIM/include
COMPONENT Development)
......@@ -5,7 +5,6 @@ FILE(GLOB_RECURSE ossim_base_SRCS "base/*.cpp" "base/*.c")
FILE(GLOB_RECURSE ossim_elevation_SRCS "elevation/*.cpp" "elevation/*.c")
FILE(GLOB_RECURSE ossim_font_SRCS "font/*.cpp" "font/*.c")
FILE(GLOB_RECURSE ossim_imaging_SRCS "imaging/*.cpp" "imaging/*.c")
#FILE(GLOB_RECURSE ossim_libpolyclip_SRCS "libpolyclip/*.cpp" "libpolyclip/*.c")
FILE(GLOB_RECURSE ossim_matrix_SRCS "matrix/*.cpp" "matrix/*.c")
FILE(GLOB_RECURSE ossim_parallel_SRCS "parallel/*.cpp" "parallel/*.c")
FILE(GLOB_RECURSE ossim_projection_SRCS "projection/*.cpp" "projection/*.c")
......@@ -47,4 +46,9 @@ ENDIF(WIN32)
ADD_LIBRARY(ossim ${OSSIM_SRCS})
TARGET_LINK_LIBRARIES(ossim itktiff itkjpeg8 itkjpeg12 itkjpeg16)
INSTALL_TARGETS(/lib/otb/ ossim)
INSTALL(TARGETS ossim
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
......@@ -6,5 +6,18 @@ svm.cxx
)
ADD_LIBRARY(otbsvm ${OTBSVM_SRCS})
INSTALL_TARGETS(/lib/otb otbsvm)
INSTALL_FILES(/include/otb/Utilities/otbsvm svm.h)
INSTALL(TARGETS otbsvm
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
INSTALL(FILES svm.h
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbsvm
COMPONENT Development)
......@@ -361,7 +361,7 @@ CONFIGURE_FILE("${OTB_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in"
"${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/InstallOnly/Hide/pkgIndex.tcl"
IMMEDIATE @ONLY)
INSTALL(FILES "${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/InstallOnly/Hide/pkgIndex.tcl"
DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}/tcl
DESTINATION ${OTB_INSTALL_LIB_DIR}/tcl
COMPONENT RuntimeLibraries)
#-----------------------------------------------------------------------------
......@@ -514,7 +514,7 @@ IF(OTB_CSWIG_PYTHON)
# Install the package python files.
FOREACH(file ${OTB_PYTHON_FILES})
INSTALL(FILES "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py"
DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}/python
DESTINATION ${OTB_INSTALL_LIB_DIR}/python
COMPONENT RuntimeLibraries)
ENDFOREACH(file)
......@@ -525,7 +525,7 @@ IF(OTB_CSWIG_PYTHON)
"${OTB_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/itkbase.py"
@ONLY IMMEDIATE)
INSTALL(FILES "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/itkbase.py"
DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}/python
DESTINATION ${OTB_INSTALL_LIB_DIR}/python
COMPONENT RuntimeLibraries)
ENDIF(OTB_CSWIG_PYTHON)
......@@ -599,9 +599,9 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
ENDIF(OTB_LIBRARY_PROPERTIES)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME}Tcl ${EXTRA_LIBS} SwigRuntimeTcl ${TCL_LIBRARY})
INSTALL(TARGETS ${LIBRARY_NAME}Tcl
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
IF(OTB_SWIG_FILE)
ADD_CUSTOM_COMMAND(
COMMENT "run native swig on ${OTB_SWIG_FILE}"
......@@ -640,9 +640,9 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
ENDFOREACH(lib)
ENDIF(OTB_WRAP_NEEDS_DEPEND)
INSTALL(TARGETS ${LIBRARY_NAME}Perl
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
IF(OTB_SWIG_FILE)
ADD_CUSTOM_COMMAND(
COMMENT "run native swig on ${OTB_SWIG_FILE}"
......@@ -680,10 +680,10 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
SET_TARGET_PROPERTIES( _${LIBRARY_NAME}Python PROPERTIES PREFIX "")
ENDIF(OTB_LIBRARY_PROPERTIES)
TARGET_LINK_LIBRARIES(_${LIBRARY_NAME}Python ${EXTRA_LIBS} SwigRuntimePython ${PYTHON_LIBRARY})
# INSTALL(TARGETS _${LIBRARY_NAME}Python
# RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
# LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
# ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
INSTALL(TARGETS _${LIBRARY_NAME}Python
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
IF(OTB_SWIG_FILE)
ADD_CUSTOM_COMMAND(
COMMENT "run native swig on ${OTB_SWIG_FILE}"
......@@ -720,9 +720,9 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
SET_TARGET_PROPERTIES(${LIBRARY_NAME}Java PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
INSTALL(TARGETS ${LIBRARY_NAME}Java
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
IF(OTB_SWIG_FILE)
ADD_CUSTOM_COMMAND(
COMMENT "run native swig on ${OTB_SWIG_FILE}"
......
SET(ITK_JAVA_CLASSPATH ${ITK_BINARY_DIR}/Wrapping/CSwig/Java)
SET(ITK_JAVA_OUTPATH ${ITK_BINARY_DIR}/Wrapping/CSwig/Java)
SET(OTB_JAVA_CLASSPATH ${OTB_BINARY_DIR}/Wrapping/CSwig/Java)
SET(OTB_JAVA_OUTPATH ${OTB_BINARY_DIR}/Wrapping/CSwig/Java)
# Relative path from InsightToolkit.jar installation to dlls.
IF(WIN32)
SET(ITK_JAVA_INSTALL_DIR "/../../bin")
SET(OTB_JAVA_INSTALL_DIR "/../../bin")
ELSE(WIN32)
SET(ITK_JAVA_INSTALL_DIR "")
SET(OTB_JAVA_INSTALL_DIR "")
ENDIF(WIN32)
IF(CMAKE_CONFIGURATION_TYPES)
SET(ITK_BASE_JAVA_FILE ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit/itkbase.java)
SET(OTB_BASE_JAVA_FILE ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit/itkbase.java)
FOREACH(config ${CMAKE_CONFIGURATION_TYPES})
SET(ITK_JAVA_BUILD_DIR ${LIBRARY_OUTPUT_PATH}/${config})
SET(OTB_JAVA_BUILD_DIR ${LIBRARY_OUTPUT_PATH}/${config})
CONFIGURE_FILE(
${ITK_SOURCE_DIR}/Wrapping/CSwig/Java/itkbase.java.in
${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${config}/InsightToolkit/itkbase.java
${OTB_SOURCE_DIR}/Wrapping/CSwig/Java/itkbase.java.in
${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${config}/InsightToolkit/itkbase.java
@ONLY IMMEDIATE
)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${config}/itk_build_tree.mark
"File next to InsightToolkit.jar to mark the build tree.\n"
)
ENDFOREACH(config)
SET(ITK_JAVA_CLASSPATH
"${ITK_JAVA_CLASSPATH}\;${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}")
SET(ITK_JAVA_OUTPATH "${ITK_JAVA_OUTPATH}/${CMAKE_CFG_INTDIR}")
SET(OTB_JAVA_CLASSPATH
"${OTB_JAVA_CLASSPATH}\;${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}")
SET(OTB_JAVA_OUTPATH "${OTB_JAVA_OUTPATH}/${CMAKE_CFG_INTDIR}")
ELSE(CMAKE_CONFIGURATION_TYPES)
SET(ITK_JAVA_BUILD_DIR ${LIBRARY_OUTPUT_PATH})
SET(ITK_BASE_JAVA_FILE ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/itkbase.java)
SET(OTB_JAVA_BUILD_DIR ${LIBRARY_OUTPUT_PATH})
SET(OTB_BASE_JAVA_FILE ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/itkbase.java)
CONFIGURE_FILE(
${ITK_SOURCE_DIR}/Wrapping/CSwig/Java/itkbase.java.in
${ITK_BASE_JAVA_FILE}
${OTB_SOURCE_DIR}/Wrapping/CSwig/Java/itkbase.java.in
${OTB_BASE_JAVA_FILE}
@ONLY IMMEDIATE
)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/itk_build_tree.mark
......@@ -38,69 +38,69 @@ ELSE(CMAKE_CONFIGURATION_TYPES)
ENDIF(CMAKE_CONFIGURATION_TYPES)
SET(ORDERING_DEP)
FOREACH(Kit ${ITK_KITS})
FOREACH(Kit ${OTB_KITS})
IF(${Kit} MATCHES VXLNumerics)
SET(DEP_FILES ${VXLNumerics_JAVA_DEPENDS})
SET(KIT_JAVA_NAME ${Kit})
ELSE(${Kit} MATCHES VXLNumerics)
SET(KIT_JAVA_NAME ITK${Kit})
SET(DEP_FILES ${ITK${Kit}_JAVA_DEPENDS})
SET(KIT_JAVA_NAME OTB${Kit})
SET(DEP_FILES ${OTB${Kit}_JAVA_DEPENDS})
ENDIF(${Kit} MATCHES VXLNumerics)
FOREACH(File ${DEP_FILES})
SET(FULL_DEP_FILES ${FULL_DEP_FILES} ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/${File})
SET(FULL_DEP_FILES ${FULL_DEP_FILES} ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/${File})
ENDFOREACH(File)
SET(ITK_JAVA_KIT_LIBS ${ITK_JAVA_KIT_LIBS} ${KIT_JAVA_NAME}Java)
SET(KIT_FILE_NAME ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/${KIT_JAVA_NAME}Java)
SET(OTB_JAVA_KIT_LIBS ${OTB_JAVA_KIT_LIBS} ${KIT_JAVA_NAME}Java)
SET(KIT_FILE_NAME ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/${KIT_JAVA_NAME}Java)
ADD_CUSTOM_COMMAND(
OUTPUT ${KIT_FILE_NAME}.class
DEPENDS ${KIT_FILE_NAME}.java ${FULL_DEP_FILES} ${ITK_BASE_JAVA_FILE} ${ORDERING_DEP}
DEPENDS ${KIT_FILE_NAME}.java ${FULL_DEP_FILES} ${OTB_BASE_JAVA_FILE} ${ORDERING_DEP}
COMMAND ${JAVA_COMPILE}
ARGS -classpath "${ITK_JAVA_CLASSPATH}" -d "${ITK_JAVA_OUTPATH}"
ARGS -classpath "${OTB_JAVA_CLASSPATH}" -d "${OTB_JAVA_OUTPATH}"
${KIT_FILE_NAME}.java
COMMENT "Java Class")
SET(ITK_JAVA_KITS_FILES ${ITK_JAVA_KITS_FILES} ${KIT_FILE_NAME}.class)
SET(OTB_JAVA_KITS_FILES ${OTB_JAVA_KITS_FILES} ${KIT_FILE_NAME}.class)
SET(ORDERING_DEP ${KIT_FILE_NAME}.class)
ENDFOREACH(Kit)
IF(CMAKE_CONFIGURATION_TYPES)
ADD_CUSTOM_COMMAND(
OUTPUT ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar
DEPENDS ${ITK_JAVA_KITS_FILES}
OUTPUT ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar
DEPENDS ${OTB_JAVA_KITS_FILES}
COMMAND ${JAVA_ARCHIVE}
ARGS -cf ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar
-C ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR} InsightToolkit
ARGS -cf ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar
-C ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR} InsightToolkit
COMMENT "Java Archive"
)
ADD_CUSTOM_TARGET(ITKJavaJar ALL DEPENDS ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar)
ADD_CUSTOM_TARGET(OTBJavaJar ALL DEPENDS ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar)
SET(DOLLAR "$")
INSTALL(FILES
${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${DOLLAR}{BUILD_TYPE}/InsightToolkit.jar
DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}
${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${DOLLAR}{BUILD_TYPE}/InsightToolkit.jar
DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
COMPONENT RuntimeLibraries)
ELSE(CMAKE_CONFIGURATION_TYPES)
ADD_CUSTOM_COMMAND(
OUTPUT ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
DEPENDS ${ITK_JAVA_KITS_FILES}
OUTPUT ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
DEPENDS ${OTB_JAVA_KITS_FILES}
COMMAND ${JAVA_ARCHIVE}
ARGS -cf ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
-C ${ITK_BINARY_DIR}/Wrapping/CSwig/Java InsightToolkit
ARGS -cf ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
-C ${OTB_BINARY_DIR}/Wrapping/CSwig/Java InsightToolkit
COMMENT "Java Archive"
)
ADD_CUSTOM_TARGET(ITKJavaJar ALL DEPENDS ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar)
ADD_CUSTOM_TARGET(OTBJavaJar ALL DEPENDS ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar)
INSTALL(FILES
${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}
${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
COMPONENT RuntimeLibraries)
ENDIF(CMAKE_CONFIGURATION_TYPES)
ADD_DEPENDENCIES(ITKJavaJar ${ITK_JAVA_KIT_LIBS} SwigRuntimeJava)
FOREACH(Kit ${ITK_KITS})
ADD_DEPENDENCIES(OTBJavaJar ${OTB_JAVA_KIT_LIBS} SwigRuntimeJava)
FOREACH(Kit ${OTB_KITS})
IF(${Kit} MATCHES VXLNumerics)
SET(KIT_JAVA_NAME ${Kit})
ELSE(${Kit} MATCHES VXLNumerics)
SET(KIT_JAVA_NAME ITK${Kit})
SET(KIT_JAVA_NAME OTB${Kit})
ENDIF(${Kit} MATCHES VXLNumerics)
ADD_DEPENDENCIES(ITKJavaJar "${KIT_JAVA_NAME}Java")
ADD_DEPENDENCIES(OTBJavaJar "${KIT_JAVA_NAME}Java")
ENDFOREACH(Kit)
ADD_LIBRARY(ITKJavaJarDummyLibrary ITKJavaJarDummyLibrary.c)
ADD_DEPENDENCIES(ITKJavaJarDummyLibrary ITKJavaJar)
ADD_LIBRARY(OTBJavaJarDummyLibrary OTBJavaJarDummyLibrary.c)
ADD_DEPENDENCIES(OTBJavaJarDummyLibrary OTBJavaJar)
......@@ -23,9 +23,9 @@ IF(OTB_CSWIG_TCL)
ENDIF(OTB_LIBRARY_PROPERTIES)
TARGET_LINK_LIBRARIES(SwigRuntimeTcl ${TCL_LIBRARY})
INSTALL(TARGETS SwigRuntimeTcl
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
ENDIF(OTB_CSWIG_TCL)
IF(OTB_CSWIG_PYTHON)
......@@ -34,10 +34,10 @@ IF(OTB_CSWIG_PYTHON)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(SwigRuntimePython PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
# INSTALL(TARGETS SwigRuntimePython
# RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
# LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
# ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
INSTALL(TARGETS SwigRuntimePython
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
ENDIF(OTB_CSWIG_PYTHON)
IF(OTB_CSWIG_PERL)
......@@ -47,9 +47,9 @@ IF(OTB_CSWIG_PERL)
SET_TARGET_PROPERTIES(SwigRuntimePerl PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
INSTALL(TARGETS SwigRuntimePerl
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
ENDIF(OTB_CSWIG_PERL)
MACRO(CREATE_SWIG_RUNTIME LangOption LibName LangPostFix)
......@@ -91,9 +91,9 @@ IF(OTB_CSWIG_JAVA)
SET_TARGET_PROPERTIES(SwigRuntimeJava PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
INSTALL(TARGETS SwigRuntimeJava
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
MAKE_DIRECTORY(${WrapOTB_BINARY_DIR}/Java/InsightToolkit)
ADD_CUSTOM_COMMAND(
COMMENT "run native swig on SwigExtras.i"
......
SET(ITK_TCL_EXE_DIR_BUILD "${ITK_EXECUTABLE_PATH}")
SET(ITK_TCL_EXE_NAME_ROOT "itkwish")
SET(OTB_TCL_EXE_DIR_BUILD "${OTB_EXECUTABLE_PATH}")
SET(OTB_TCL_EXE_NAME_ROOT "itkwish")
CONFIGURE_FILE(${ITK_SOURCE_DIR}/Wrapping/CSwig/Tcl/itkTclConfigure.h.in
${ITK_BINARY_DIR}/Wrapping/CSwig/Tcl/itkTclConfigure.h)
CONFIGURE_FILE(${OTB_SOURCE_DIR}/Wrapping/CSwig/Tcl/itkTclConfigure.h.in
${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/itkTclConfigure.h)
INCLUDE_DIRECTORIES(${ITK_BINARY_DIR}/Wrapping/CSwig/Tcl)
INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl)
ADD_EXECUTABLE(itkwish itkTclAppInit.cxx)
TARGET_LINK_LIBRARIES(itkwish
ITKAlgorithmsTcl
ITKBasicFiltersATcl
ITKBasicFiltersBTcl
ITKIOTcl
ITKNumericsTcl
ITKCommonATcl
ITKCommonBTcl
OTBAlgorithmsTcl
OTBBasicFiltersATcl
OTBBasicFiltersBTcl
OTBIOTcl
OTBNumericsTcl
OTBCommonATcl
OTBCommonBTcl
VXLNumericsTcl
SwigRuntimeTcl
${TCL_LIBRARY}
${TK_LIBRARY}
)
IF(ITK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkwish PROPERTIES ${ITK_LIBRARY_PROPERTIES})
ENDIF(ITK_LIBRARY_PROPERTIES)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(itkwish PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
INSTALL(TARGETS itkwish
RUNTIME DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeExecutables)
RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeExecutables)
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/itkinteraction.tcl
${CMAKE_CURRENT_SOURCE_DIR}/itktesting.tcl
${CMAKE_CURRENT_SOURCE_DIR}/itkdata.tcl
DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}/tcl