ENH: Improve OSSIM CMakeLists for install dir

Testing/CMakeLists.txt

@@ -31,14 +31,59 @@ ELSE(OTB_BINARY_DIR)
   FIND_PATH(OTB_DATA_ROOT OTBData.readme ${OTBTesting_SOURCE_DIR}/Data $ENV{OTB_DATA_ROOT})
   MARK_AS_ADVANCED(OTB_DATA_ROOT)
 
+  OPTION(OTB_DATA_USE_LARGEINPUT "Use Large inputs images test." OFF)
+  MARK_AS_ADVANCED(OTB_DATA_USE_LARGEINPUT)
+  IF(OTB_DATA_USE_LARGEINPUT)
+    FIND_PATH(OTB_DATA_LARGEINPUT_ROOT OTBData.readme $ENV{OTB_DATA_LARGEINPUT_ROOT})
+    MARK_AS_ADVANCED(OTB_DATA_LARGEINPUT_ROOT)
+  ENDIF(OTB_DATA_USE_LARGEINPUT)
   # Find OTB and load its settings.
   FIND_PACKAGE(OTB)
   IF(OTB_FOUND)
     INCLUDE(${OTB_USE_FILE})
-    SUBDIRS(Code Fa Utilities)
+#    SUBDIRS(Code Fa Utilities)
+    SUBDIRS(Code)
   ELSE(OTB_FOUND)
     MESSAGE("OTB not found.  Please set OTB_DIR")
   ENDIF(OTB_FOUND)
+
+  IF(NOT OTB_INSTALL_BIN_DIR)
+    SET(OTB_INSTALL_BIN_DIR "/bin")
+  ENDIF(NOT OTB_INSTALL_BIN_DIR)
+
+  IF(NOT OTB_INSTALL_LIB_DIR)
+    SET(OTB_INSTALL_LIB_DIR "/lib/otb")
+  ENDIF(NOT OTB_INSTALL_LIB_DIR)
+
+  IF(NOT OTB_INSTALL_DATA_DIR)
+    SET(OTB_INSTALL_DATA_DIR "/share/otb")
+  ENDIF(NOT OTB_INSTALL_DATA_DIR)
+
+  IF(NOT OTB_INSTALL_INCLUDE_DIR)
+    SET(OTB_INSTALL_INCLUDE_DIR "/include/otb")
+  ENDIF(NOT OTB_INSTALL_INCLUDE_DIR)
+
+  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_LIB_DIR_CM24 "${OTB_INSTALL_LIB_DIR}")
+  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_BIN_DIR_CM24 "${OTB_INSTALL_BIN_DIR}")
+  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_INCLUDE_DIR_CM24 "${OTB_INSTALL_INCLUDE_DIR}")
+
+  MACRO(OTB_ADD_EXECUTABLE name sources libraries)
+    ADD_EXECUTABLE(${name} ${sources})
+    TARGET_LINK_LIBRARIES(${name}  ${libraries})
+    IF(OTB_CPP_CHECK_SOURCE_FILE)
+      FOREACH( file ${sources})
+        ADD_CUSTOM_COMMAND( TARGET ${name}
+                            PRE_BUILD
+                            COMMAND ${OTB_CPP_CHECK_PROG}
+                            ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+                            DEPENDS ${libraries}
+                            COMMENT "============== C++ checking ${file} source file...  =================="
+                            VERBATIM )
+      ENDFOREACH(file)
+    ENDIF(OTB_CPP_CHECK_SOURCE_FILE)
+  ENDMACRO(OTB_ADD_EXECUTABLE)
+
+
 ENDIF(OTB_BINARY_DIR)
 
 IF(OTB_COMPILE_WITH_FULL_WARNING)
@@ -47,3 +92,4 @@ IF(OTB_COMPILE_WITH_FULL_WARNING)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OTB_FULL_WARNING_LIST_PARAMETERS}")
   ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(OTB_COMPILE_WITH_FULL_WARNING)
+

Utilities/otbossim/CMakeLists.txt

@@ -159,7 +159,12 @@ FILE(GLOB ossim_kbool_HDRS "include/ossim/kbool/*.h")
 FILE(GLOB ossim_matrix_HDRS "include/ossim/matrix/*.h")
 FILE(GLOB ossim_parallel_HDRS "include/ossim/parallel/*.h")
 FILE(GLOB ossim_plugin_HDRS "include/ossim/plugin/*.h")
-FILE(GLOB_RECURSE ossim_projection_HDRS "include/ossim/projection/*.h")
+FILE(GLOB ossim_projection_HDRS "include/ossim/projection/*.h")
+FILE(GLOB ossim_projection_sarmodel_HDRS "include/ossim/projection/SARModel/*.h")
+FILE(GLOB ossim_projection_sarmodel_DateTime_HDRS "include/ossim/projection/SARModel/DateTime/*.h")
+FILE(GLOB ossim_projection_sarmodel_Coordinates_HDRS "include/ossim/projection/SARModel/Coordinates/*.h")
+FILE(GLOB ossim_projection_sarmodel_Ephemeris_HDRS "include/ossim/projection/SARModel/Ephemeris/*.h")
+FILE(GLOB ossim_projection_sarmodel_Interpolator_HDRS "include/ossim/projection/SARModel/Interpolator/*.h")
 FILE(GLOB ossim_support_data_HDRS "include/ossim/support_data/*.h")
 FILE(GLOB ossim_vec_HDRS "include/ossim/vec/*.h")
 FILE(GLOB ossim_vpfutil_HDRS "include/ossim/vpfutil/*.h")
@@ -196,6 +201,21 @@ INSTALL(FILES ${ossim_plugin_HDRS}
 INSTALL(FILES ${ossim_projection_HDRS}
     DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/projection
     COMPONENT Development)
+INSTALL(FILES ${ossim_projection_sarmodel_HDRS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/projection/SARModel
+    COMPONENT Development)
+INSTALL(FILES ${ossim_projection_sarmodel_DateTime_HDRS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/projection/SARModel/DateTime
+    COMPONENT Development)
+INSTALL(FILES ${ossim_projection_sarmodel_Coordinates_HDRS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/projection/SARModel/Coordinates
+    COMPONENT Development)
+INSTALL(FILES ${ossim_projection_sarmodel_Ephemeris_HDRS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/projection/SARModel/Ephemeris
+    COMPONENT Development)
+INSTALL(FILES ${ossim_projection_sarmodel_Interpolator_HDRS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/projection/SARModel/Interpolator
+    COMPONENT Development)
 INSTALL(FILES ${ossim_support_data_HDRS}
     DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/support_data
     COMPONENT Development)

otbIncludeDirectories.cmake

@@ -319,6 +319,7 @@ SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
   Utilities/otbliblas/include
   Utilities/otbedison
   Utilities/otbsiftfast
+  Utilities/dxflib
 )
 
 IF(OTB_COMPILE_JPEG2000)