r17625 by jghali - fix potential conflict between some python and poppler headers on non case sensitive filesystems by using poppler and python includes only when strictly necessary

[scribus-commit]

Author: jghali
Date: Sun Jun 24 20:25:19 2012
New Revision: 17625

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17625
Log:
fix potential conflict between some python and poppler headers on non case sensitive filesystems by using poppler and python includes only when strictly necessary

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
    trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17625&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun Jun 24 20:25:19 2012
@@ -834,19 +834,12 @@
   ${JPEG_INCLUDE_DIR}
   ${LCMS_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
-  ${PYTHON_INCLUDE_PATH}
   ${TIFF_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
   ${OPENGL_INCLUDE_DIR}
   ${OSG_INCLUDE_DIR}
   ${GSL_INCLUDE_DIR}
 )
-
-IF (HAVE_POPPLER)
-  INCLUDE_DIRECTORIES(
-	${POPPLER_INCLUDE_DIR}
-  )
-ENDIF (HAVE_POPPLER)
 
 ##############################################################################################################
 ########## Uninstall Setup                                                                          ##########

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17625&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h Sun Jun 24 20:25:19 2012
@@ -26,7 +26,6 @@
 #include "selection.h"
 #include "vgradient.h"
 
-#include <pyport.h>
 #include <goo/gtypes.h>
 #include <Object.h>
 #include <OutputDev.h>

Modified: trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17625&path=/trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt Sun Jun 24 20:25:19 2012
@@ -1,6 +1,7 @@
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
+${PYTHON_INCLUDE_PATH}
 )
 
 SET(SCRIPTER_PLUGIN_MOC_CLASSES

Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17625&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt Sun Jun 24 20:25:19 2012
@@ -1,6 +1,7 @@
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
+${PYTHON_INCLUDE_PATH}
 )
 
 # Gentoo has an option for no examples. Let's make the ebuild simpler and open up the option to others, but leave as a default for us