ENH: more cmake-ish FindOssim

CMake/FindOssim.cmake

 # - Find Ossim
 # Find the native Ossim includes and library
 #
-#   OSSIM_FOUND       - True if Ossim found.
-#   OSSIM_INCLUDE_DIR - where to find tinyxml.h, etc.
-#   OSSIM_LIBRARIES   - List of libraries when using Ossim.
+#   OSSIM_FOUND        - True if Ossim found.
+#   OSSIM_INCLUDE_DIRS - where to find tinyxml.h, etc.
+#   OSSIM_LIBRARIES    - List of libraries when using Ossim.
 #
 
 IF( OSSIM_INCLUDE_DIR )
@@ -25,3 +25,12 @@ INCLUDE( FindPackageHandleStandardArgs )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( Ossim DEFAULT_MSG OSSIM_INCLUDE_DIR OSSIM_LIBRARY )
 
 MARK_AS_ADVANCED( OSSIM_INCLUDE_DIR OSSIM_LIBRARY )
+
+IF(OSSIM_FOUND)
+  SET(OSSIM_INCLUDE_DIRS ${OSSIM_INCLUDE_DIR})
+  SET(OSSIM_LIBRARIES ${OSSIM_LIBRARY})
+ELSE(OSSIM_FOUND)
+  SET(OSSIM_INCLUDE_DIRS)
+  SET(OSSIM_LIBRARIES)
+ENDIF(OSSIM_FOUND)
+

CMake/ImportOssim.cmake

@@ -7,6 +7,6 @@ MARK_AS_ADVANCED(OTB_USE_EXTERNAL_OSSIM)
 IF(OTB_USE_EXTERNAL_OSSIM)
   FIND_PACKAGE(Ossim REQUIRED)
 ELSE(OTB_USE_EXTERNAL_OSSIM)
-  SET(OSSIM_LIBRARY otbossim)
+  SET(OSSIM_LIBRARIES otbossim)
 ENDIF(OTB_USE_EXTERNAL_OSSIM)
 

Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt

@@ -10,7 +10,7 @@ ELSE(OTB_USE_EXTERNAL_OSSIM)
 ENDIF(OTB_USE_EXTERNAL_OSSIM)
 
 ADD_LIBRARY(OTBOssimAdapters ${OTBOssimAdapters_SRCS})
-TARGET_LINK_LIBRARIES (OTBOssimAdapters ${OSSIM_LIBRARY} otbossimplugins ITKCommon)
+TARGET_LINK_LIBRARIES (OTBOssimAdapters ${OSSIM_LIBRARIES} otbossimplugins ITKCommon)
 IF(OTB_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(OTBOssimAdapters PROPERTIES ${OTB_LIBRARY_PROPERTIES})
 ENDIF(OTB_LIBRARY_PROPERTIES)

Utilities/otbossimplugins/CMakeLists.txt

@@ -42,7 +42,7 @@ SET(ossimplugins_SOURCES
 )
 
 ADD_LIBRARY(otbossimplugins ${ossimplugins_LIBTYPE} ${ossimplugins_SOURCES} )
-TARGET_LINK_LIBRARIES(otbossimplugins ${GEOTIFF_LIBRARY} ${GDAL_LIBRARY} ${OGR_LIBRARY} ${OSSIM_LIBRARY})
+TARGET_LINK_LIBRARIES(otbossimplugins ${GEOTIFF_LIBRARY} ${GDAL_LIBRARY} ${OGR_LIBRARY} ${OSSIM_LIBRARIES})
 SET_TARGET_PROPERTIES(otbossimplugins
                       PROPERTIES VERSION "${OSSIMPLUGINS_SVN_REVISION}.${OSSIMPLUGINS_OTB_PATCH}.0"
                                  SOVERSION "${OSSIMPLUGINS_SVN_REVISION}.${OSSIMPLUGINS_OTB_PATCH}")