r20245 by craig - #13224: Fix build when libvisio/libcdr/libmspub installed without librevenge

[scribus-commit]

Author: craig
Date: Fri Jul 10 16:29:24 2015
New Revision: 20245

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20245
Log:
#13224: Fix build when libvisio/libcdr/libmspub installed without librevenge

Modified:
    trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
    trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt

Modified: trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20245&path=/trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt Fri Jul 10 16:29:24 2015
@@ -20,7 +20,7 @@
 		IF (LIBWPD_FOUND)
 			pkg_check_modules(LIBWPD_STREAM libwpd-stream-0.9)
 			IF (LIBWPD_STREAM_FOUND)
-				pkg_check_modules(LIBCDR libcdr-0.0=0.0)
+				pkg_check_modules(LIBCDR libcdr-0.0<=0.1)
 				IF (LIBCDR_FOUND)
 					INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
 					SET(IMPORTCDR_PLUGIN_MOC_CLASSES importcdr.h importcdrplugin.h)

Modified: trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20245&path=/trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt Fri Jul 10 16:29:24 2015
@@ -14,7 +14,7 @@
 		ADD_DEPENDENCIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
 	ENDIF (LIBMSPUB_FOUND)
 ELSE (HAVE_REVENGE)
-	pkg_check_modules(LIBMSPUB libmspub-0.0=0.0)
+	pkg_check_modules(LIBMSPUB libmspub-0.0<=0.1)
 	IF (LIBMSPUB_FOUND)
 		pkg_check_modules(LIBWPG libwpg-0.2)
 		IF (LIBWPG_FOUND)

Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20245&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp Fri Jul 10 16:29:24 2015
@@ -2503,7 +2503,7 @@
 		}
 		else
 		{
-			else if ((m_style["libwpg:mime-type"]->getStr() == "image/wmf") || (m_style["libwpg:mime-type"]->getStr() == "image/emf"))
+			if ((m_style["libwpg:mime-type"]->getStr() == "image/wmf") || (m_style["libwpg:mime-type"]->getStr() == "image/emf"))
 			{
 				if (m_style["libwpg:mime-type"]->getStr() == "image/wmf")
 					imgExt = "wmf";

Modified: trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20245&path=/trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt Fri Jul 10 16:29:24 2015
@@ -20,7 +20,7 @@
 		IF (LIBWPD_FOUND)
 			pkg_check_modules(LIBWPD_STREAM libwpd-stream-0.9)
 			IF (LIBWPD_STREAM_FOUND)
-				pkg_check_modules(LIBVISIO libvisio-0.0=0.0)
+				pkg_check_modules(LIBVISIO libvisio-0.0<=0.1)
 				IF (LIBVISIO_FOUND)
 					INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
 					SET(IMPORTVSD_PLUGIN_MOC_CLASSES importvsd.h importvsdplugin.h)