From 05352e2055cb65496b49d95147358b03e9c0a2f4 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Wed, 12 Sep 2007 14:45:16 +0000
Subject: [PATCH] Correction make install : que des .h dans rep otb6S !
---
Testing/Fa/CMakeLists.txt | 20 ++++++++++++++++++++
Utilities/otb6S/CMakeLists.txt | 8 ++------
otbIncludeDirectories.cmake | 4 ----
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/Testing/Fa/CMakeLists.txt b/Testing/Fa/CMakeLists.txt
index 29279eb48d..6480e5a935 100755
--- a/Testing/Fa/CMakeLists.txt
+++ b/Testing/Fa/CMakeLists.txt
@@ -158,11 +158,31 @@ ADD_TEST(FA-00052-vi_Floating_Point_Exception ${VISU_TESTS}
${EXAMPLES_DATA}/ROI_QB_MUL_1.png
)
+# --- FA 00060 : Pb Map activation ---
+ADD_TEST(FA-00060-le_Map_Activation ${CXX_TEST_PATH}/MapActivation
+ ${INPUTDATA}/list.mhd
+ 4
+ 4
+ 20
+ 1.0
+ 0.1
+ 128
+ 1
+ ${TEMP}/FA-00013-le-som.hd
+ ${TEMP}/FA-00013-le-som-zoom.mhd
+ ${TEMP}/FA-00013-le-actMap.png
+ ${TEMP}/FA-00013-le-actMap-zoom.png
+ ${TEMP}/FA-00013-le-som.mhd
+ )
+
# ------- Fin des FAs traitees -----------------------------------
ADD_EXECUTABLE(AlignementsQB AlignementsQB.cxx)
TARGET_LINK_LIBRARIES(AlignementsQB OTBFeatureExtraction OTBIO OTBCommon gdal ITKIO ITKCommon)
+ADD_EXECUTABLE(MapActivation MapActivation.cxx)
+TARGET_LINK_LIBRARIES(MapActivation OTBFeatureExtraction OTBIO OTBCommon gdal ITKIO ITKCommon)
+
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Utilities/otb6S/CMakeLists.txt b/Utilities/otb6S/CMakeLists.txt
index 6709681828..7432c4f57e 100755
--- a/Utilities/otb6S/CMakeLists.txt
+++ b/Utilities/otb6S/CMakeLists.txt
@@ -82,14 +82,10 @@ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/6SV1.0B/*.h")
-FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/libf2c/*.h")
+FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
INSTALL(FILES __files1
- DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S/6SV1.0B
- COMPONENT Development)
-INSTALL(FILES __files2
- DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S/libf2c
+ DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S
COMPONENT Development)
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index a10b584a02..4f4f0ee87f 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -31,8 +31,6 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/dxflib
${OTB_SOURCE_DIR}/Utilities/InsightJournal
${OTB_SOURCE_DIR}/Utilities/otb6S
- ${OTB_SOURCE_DIR}/Utilities/otb6S/6SV1.0B
- ${OTB_SOURCE_DIR}/Utilities/otb6S/libf2c
)
#-----------------------------------------------------------------------------
@@ -117,8 +115,6 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim
${OTB_INSTALL_INCLUDE_DIR}/Utilities/InsightJournal
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S
- ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S/6SV1.0B
- ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S/libf2c
)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
--
GitLab