Can't build with BUILD_OSSIMPREDATOR=OFF

[jmalik]

Build issue reported on ML

This diff fixes the problem :

Index: oms/coms/include/oms/Video.h =================================================================== --- oms/coms/include/oms/Video.h (revision 19858) +++ oms/coms/include/oms/Video.h (working copy) @@ -2,6 +2,7 @@

#define omsVideo_HEADER 1 #include <string> #include <ossim/base/ossimConstants.h>

+#include <ossim/base/ossimReferenced.h>

#include <oms/Constants.h> #ifdef OSSIM_PREDATOR_VIDEO_ENABLED #include <ossimPredator/ossimPredatorVideo.h>

Index: ossimPlanetQt/CMakeLists.txt =================================================================== --- ossimPlanetQt/CMakeLists.txt (revision 19858) +++ ossimPlanetQt/CMakeLists.txt (working copy) @@ -59,6 +59,11 @@

OSSIM_QT4_WRAP_UI(OSSIMPLANETQT_UI_SRC ${OSSIMPLANETQT_UIS} )

SET(INCLUDE_DIR "include/ossimPlanetQt")

+ +IF(NOT BUILD_OSSIMPREDATOR) + SET(OSSIMPREDATOR_LIBRARY "") +ENDIF() +

OSSIM_LINK_LIBRARY(${LIB_NAME} COMPONENT_NAME ossim TYPE

"${OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC}" HEADERS ${OSSIMPLANETQT_INCLUDES} ${OSSIMPLANETQT_UI_SRC} SOURCE_FILES ${OSSIMPLANETQT_SRCS} ${OSSIMPLANETQT_MOC_SRCS}

LIBRARIES ${OSSIM_LIBRARY} ${OSGVIEWER_LIBRARY}

${OSGDB_LIBRARY} ${OSGGA_LIBRARY} ${OSGTEXT_LIBRARY} ${OSGUTIL_LIBRARY} ${OSG_LIBRARY} ${OPENTHREADS_LIBRARY} ${JPEG_LIBRARY} ${WMS_LIBRARY} ${GPSTK_LIBRARY} ${OSSIMPREDATOR_LIBRARY} ${ZLIB_LIBRARY} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${WMS_LIBRARY} ${OSSIMPLANET_LIBRARY}

INSTALL_LIB INSTALL_HEADERS VERSION_SYMLINKS

ADDITIONAL_COMPILE_FLAGS "-DOSSIMPLANETQT_LIBRARY")

[bradh]

I didn't need the first part of the patch, but I definitely needed the second part:

Index: ossimPlanetQt/CMakeLists.txt
===================================================================
--- ossimPlanetQt/CMakeLists.txt        (revision 21962)
+++ ossimPlanetQt/CMakeLists.txt        (working copy)
@@ -58,6 +58,10 @@
 SET(UI_DESTINATION_DIR ${${PROJECT_NAME}_SOURCE_DIR}/include/ossimPlanetQt)
 OSSIM_QT4_WRAP_UI(OSSIMPLANETQT_UI_SRC ${OSSIMPLANETQT_UIS} )
 
+IF(NOT BUILD_OSSIMPREDATOR)
+   SET(OSSIMPREDATOR_LIBRARY "")
+ENDIF(NOT BUILD_OSSIMPREDATOR)
+
 SET(INCLUDE_DIR "include/ossimPlanetQt")
 OSSIM_LINK_LIBRARY(${LIB_NAME} COMPONENT_NAME ossim TYPE "${OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC}" HEADERS ${OSSIMPLANETQT_INCLUDES} ${OSSIMPLANETQT_UI_SRC} SOURCE_FILES ${OSSIMPLANETQT_SRCS}  ${OSSIMPLANETQT_MOC_SRCS}
                    LIBRARIES ${OSSIM_LIBRARY} ${OSGVIEWER_LIBRARY} ${OSGDB_LIBRARY} ${OSGGA_LIBRARY}  ${OSGTEXT_LIBRARY} ${OSGUTIL_LIBRARY}  ${OSG_LIBRARY}  ${OPENTHREADS_LIBRARY} ${JPEG_LIBRARY} ${WMS_LIBRARY} ${GPSTK_LIBRARY} ${OSSIMPREDATOR_LIBRARY} ${ZLIB_LIBRARY} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${WMS_LIBRARY} ${OSSIMPLANET_LIBRARY}