Moved finding of RSVG, Poppler-glib and GtkGl out into their own Find*.cmake modules to enable easier specialization.

src/osgPlugins/CMakeLists.txt

@@ -234,11 +234,11 @@ IF(ZLIB_FOUND)
     ADD_SUBDIRECTORY(zip)
 ENDIF()
 
-IF(RSVG_FOUND AND CAIRO_FOUND)
+IF(RSVG_FOUND)
     ADD_SUBDIRECTORY(svg)
 ENDIF()
 
-IF(POPPLER_FOUND AND CAIRO_FOUND)
+IF(POPPLER_FOUND)
     ADD_SUBDIRECTORY(pdf)
 ENDIF()
 

src/osgPlugins/pdf/CMakeLists.txt

@@ -1,33 +1,10 @@
-INCLUDE(CheckCXXSourceRuns)
+SET(TARGET_SRC ReaderWriterPDF.cpp )
 
-SET(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS} )
+LINK_DIRECTORIES(${CAIRO_LIBRARY_DIRS} ${POPPLER_LIBRARY_DIRS})
+SET(TARGET_EXTERNAL_LIBRARIES  ${CAIRO_LIBRARIES} ${POPPLER_LIBRARIES} )
 
-# Do step by step checking,
-CHECK_CXX_SOURCE_RUNS("
-#include <cstdlib>
-#include <poppler.h>
-int main()
-{
-#ifdef POPPLER_HAS_CAIRO
-   return EXIT_SUCCESS;
-#else
-   return EXIT_FAILURE
-#endif
-}
-" POPPLER_HAS_CAIRO)
+SET(TARGET_ADDED_LIBRARIES osgWidget)
 
-
-IF (POPPLER_HAS_CAIRO)
-
-    SET(TARGET_SRC ReaderWriterPDF.cpp )
-
-    INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS} )
-    LINK_DIRECTORIES(${CAIRO_LIBRARY_DIRS} ${POPPLER_LIBRARY_DIRS})
-    SET(TARGET_EXTERNAL_LIBRARIES  ${CAIRO_LIBRARIES} ${POPPLER_LIBRARIES} )
-
-    SET(TARGET_ADDED_LIBRARIES osgWidget)
-
-    #### end var setup  ###
-    SETUP_PLUGIN(pdf pdf)
-
-ENDIF()
+#### end var setup  ###
+SETUP_PLUGIN(pdf pdf)