r18497 by jghali - Bump LittleCMS version requirement to lcms2

[scribus-commit]

Author: jghali
Date: Tue Sep 24 21:47:31 2013
New Revision: 18497

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18497
Log:
Bump LittleCMS version requirement to lcms2

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/cmake/modules/FindLCMS2.cmake
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/colormgmt/CMakeLists.txt
    trunk/Scribus/scribus/colormgmt/sccolormgmtenginefactory.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18497&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Tue Sep 24 21:47:31 2013
@@ -600,26 +600,14 @@
 
 #<<LittleCMS
 SET(LCMS_DIR ${CMAKE_MODULE_PATH})
-  FIND_PACKAGE(LCMS)
-  IF(LCMS_FOUND)
-    SET(HAVE_LCMS1 1)
-  ENDIF(LCMS_FOUND)
-FIND_PACKAGE(LCMS2)
+FIND_PACKAGE(LCMS2 REQUIRED)
 IF(LCMS2_FOUND)
   SET(HAVE_LCMS2 1)
   SET(HAVE_CMS 1)
   SET(CMS_INC "\"lcms2.h\"")
   MESSAGE("LittleCMS-2 Library Found OK")
 ELSE(LCMS2_FOUND)
-  FIND_PACKAGE(LCMS REQUIRED)
-  IF(LCMS_FOUND)
-    SET(HAVE_CMS 1)
-    SET(HAVE_LCMS1 1)
-    SET(CMS_INC "\"lcms.h\"")
-    MESSAGE("LittleCMS Library Found OK")
-  ELSE(LCMS_FOUND)
-    MESSAGE(FATAL_ERROR "Could not find the LittleCMS Library")
-  ENDIF(LCMS_FOUND)
+   MESSAGE(FATAL_ERROR "Could not find the LittleCMS 2 Library")
 ENDIF(LCMS2_FOUND)
 #>>LittleCMS
 
@@ -755,6 +743,7 @@
   ${FREETYPE_INCLUDE_DIR}
   ${FONTCONFIG_INCLUDE_DIR}
   ${JPEG_INCLUDE_DIR}
+  ${LCMS2_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${TIFF_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
@@ -768,12 +757,6 @@
   ${CUPS_INCLUDE_DIR}
 )
 ENDIF (NOT WIN32 AND NOT HAIKU)
-
-IF (LCMS2_FOUND)
-  INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
-ELSE (LCMS2_FOUND)
-  INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} )
-ENDIF (LCMS2_FOUND)
 
 ##############################################################################################################
 ########## Uninstall Setup                                                                          ##########

Modified: trunk/Scribus/cmake/modules/FindLCMS2.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18497&path=/trunk/Scribus/cmake/modules/FindLCMS2.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLCMS2.cmake (original)
+++ trunk/Scribus/cmake/modules/FindLCMS2.cmake Tue Sep 24 21:47:31 2013
@@ -43,7 +43,7 @@
 
 IF (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
   SET( LCMS2_FOUND 1 )
-  SET( LCMS_LIBRARIES ${LCMS2_LIBRARY} )
+  SET( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
 ELSE (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
   SET( LCMS2_FOUND 0 )
 ENDIF (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18497&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Tue Sep 24 21:47:31 2013
@@ -1189,7 +1189,7 @@
   ${SCRIBUS_FONTS_LIB}
   ${SCRIBUS_WPG_LIB}
   ${SCRIBUS_PGF_LIB}
-  ${LCMS_LIBRARIES}
+  ${LCMS2_LIBRARIES}
 )
 
 IF(WITH_TESTS)

Modified: trunk/Scribus/scribus/colormgmt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18497&path=/trunk/Scribus/scribus/colormgmt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/colormgmt/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/colormgmt/CMakeLists.txt Tue Sep 24 21:47:31 2013
@@ -3,21 +3,12 @@
 ${CMAKE_SOURCE_DIR}/scribus
 )
 
-IF(HAVE_LCMS2)
-	INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
-	SET(SCRIBUS_LCMS_IMPL_SOURCES
-		sclcms2colormgmtengineimpl.cpp
-		sclcms2colorprofileimpl.cpp
-		sclcms2colortransformimpl.cpp
-	)
-ELSE(HAVE_LCMS2)
-	INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} )
-	SET(SCRIBUS_LCMS_IMPL_SOURCES
-		sclcmscolormgmtengineimpl.cpp
-		sclcmscolorprofileimpl.cpp
-		sclcmscolortransformimpl.cpp
-	)
-ENDIF(HAVE_LCMS2)
+INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
+SET(SCRIBUS_LCMS_IMPL_SOURCES
+	sclcms2colormgmtengineimpl.cpp
+	sclcms2colorprofileimpl.cpp
+	sclcms2colortransformimpl.cpp
+)
 
 SET(SCRIBUS_COLORMGMT_LIB_SOURCES
 	sccolormgmtengine.cpp

Modified: trunk/Scribus/scribus/colormgmt/sccolormgmtenginefactory.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18497&path=/trunk/Scribus/scribus/colormgmt/sccolormgmtenginefactory.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolormgmtenginefactory.cpp (original)
+++ trunk/Scribus/scribus/colormgmt/sccolormgmtenginefactory.cpp Tue Sep 24 21:47:31 2013
@@ -8,11 +8,7 @@
 #include "scconfig.h"
 #include "sccolormgmtenginefactory.h"
 
-#ifdef HAVE_LCMS2
 #include "sclcms2colormgmtengineimpl.h"
-#else
-#include "sclcmscolormgmtengineimpl.h"
-#endif
 
 ScColorMgmtEngineFactory colorMgmtEngineFactory;
 
@@ -24,11 +20,6 @@
 
 ScColorMgmtEngine ScColorMgmtEngineFactory::createDefaultEngine()
 {
-#ifdef HAVE_LCMS2
 	ScColorMgmtEngine lcms2Engine(new ScLcms2ColorMgmtEngineImpl());
 	return lcms2Engine;
-#else
-	ScColorMgmtEngine lcmsEngine(new ScLcmsColorMgmtEngineImpl());
-	return lcmsEngine;
-#endif
 }