r19729 by fschmid - Fixed Bug #12759: Scribus doesnt build with libvisio/librevenge

[scribus-commit]

Author: fschmid
Date: Sun Jan  4 15:02:50 2015
New Revision: 19729

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19729
Log:
Fixed Bug #12759: Scribus doesnt build with libvisio/librevenge
by adjusting the CMake calls to find the correct library versions.

Modified:
    trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
    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=19729&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 Sun Jan  4 15:02:50 2015
@@ -1,6 +1,6 @@
 INCLUDE(FindPkgConfig)
 IF (HAVE_REVENGE)
-	pkg_check_modules(LIBCDR libcdr-0.1)
+	pkg_check_modules(LIBCDR libcdr-0.1>=0.1)
 	IF (LIBCDR_FOUND)
 		MESSAGE("Building Corel Draw Importer with librevenge")
 		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
@@ -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)
+				pkg_check_modules(LIBCDR libcdr-0.0=0.0)
 				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=19729&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 Sun Jan  4 15:02:50 2015
@@ -1,6 +1,6 @@
 INCLUDE(FindPkgConfig)
 IF (HAVE_REVENGE)
-	pkg_check_modules(LIBMSPUB libmspub-0.1)
+	pkg_check_modules(LIBMSPUB libmspub-0.1>=0.1)
 	IF (LIBMSPUB_FOUND)
 		MESSAGE("Building MS-Publisher Importer with librevenge")
 		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBMSPUB_INCLUDE_DIRS})
@@ -14,7 +14,7 @@
 		ADD_DEPENDENCIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
 	ENDIF (LIBMSPUB_FOUND)
 ELSE (HAVE_REVENGE)
-	pkg_check_modules(LIBMSPUB libmspub-0.0)
+	pkg_check_modules(LIBMSPUB libmspub-0.0=0.0)
 	IF (LIBMSPUB_FOUND)
 		pkg_check_modules(LIBWPG libwpg-0.2)
 		IF (LIBWPG_FOUND)

Modified: trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19729&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 Sun Jan  4 15:02:50 2015
@@ -1,6 +1,6 @@
 INCLUDE(FindPkgConfig)
 IF (HAVE_REVENGE)
-	pkg_check_modules(LIBVISIO libvisio-0.1)
+	pkg_check_modules(LIBVISIO libvisio-0.1>=0.1)
 	IF (LIBVISIO_FOUND)
 		MESSAGE("Building MS-Visio Importer with librevenge")
 		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
@@ -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)
+				pkg_check_modules(LIBVISIO libvisio-0.0=0.0)
 				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)