diff options
| author | Karl Cheng <qantas94heavy@gmail.com> | 2019-05-10 07:56:07 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-05-12 12:45:27 +0000 |
| commit | e6ad8433954db069908bac240f39911fc32e5025 (patch) | |
| tree | e655e16ddc932b6e936ca8ff85626ee5c0fdf023 /CMakeScripts | |
| parent | rename to avoid name clashes. (diff) | |
| download | inkscape-e6ad8433954db069908bac240f39911fc32e5025.tar.gz inkscape-e6ad8433954db069908bac240f39911fc32e5025.zip | |
Remove support for LCMS 1
Now that all platforms (including macOS) now support LCMS 2, we no
longer need to support LCMS 1.
Fixes: https://bugs.launchpad.net/inkscape/+bug/1133014
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 11 | ||||
| -rw-r--r-- | CMakeScripts/Modules/FindLCMS.cmake | 90 |
2 files changed, 1 insertions, 100 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 6373314fa..84a1c2f07 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -81,7 +81,6 @@ if(WITH_JEMALLOC) endif() if(ENABLE_LCMS) - unset(HAVE_LIBLCMS1) unset(HAVE_LIBLCMS2) find_package(LCMS2) if(LCMS2_FOUND) @@ -90,15 +89,7 @@ if(ENABLE_LCMS) add_definitions(${LCMS2_DEFINITIONS}) set (HAVE_LIBLCMS2 ON) else() - find_package(LCMS) - if(LCMS_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES}) - add_definitions(${LCMS_DEFINITIONS}) - set (HAVE_LIBLCMS1 ON) - else() - set(ENABLE_LCMS OFF) - endif() + set(ENABLE_LCMS OFF) endif() endif() diff --git a/CMakeScripts/Modules/FindLCMS.cmake b/CMakeScripts/Modules/FindLCMS.cmake deleted file mode 100644 index a69d88a42..000000000 --- a/CMakeScripts/Modules/FindLCMS.cmake +++ /dev/null @@ -1,90 +0,0 @@ -# - Try to find LCMS -# Once done this will define -# -# LCMS_FOUND - system has LCMS -# LCMS_INCLUDE_DIRS - the LCMS include directory -# LCMS_LIBRARIES - Link these to use LCMS -# LCMS_DEFINITIONS - Compiler switches required for using LCMS -# -# Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com> -# -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - - -if (LCMS_LIBRARIES AND LCMS_INCLUDE_DIRS) - # in cache already - set(LCMS_FOUND TRUE) -else (LCMS_LIBRARIES AND LCMS_INCLUDE_DIRS) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - include(UsePkgConfig) - pkgconfig(lcms _LCMS_INCLUDEDIR _LCMS_LIBDIR _LCMS_LDFLAGS _LCMS_CFLAGS) - else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_LCMS lcms) - endif (PKG_CONFIG_FOUND) - endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_path(LCMS_INCLUDE_DIR - NAMES - lcms.h - PATHS - ${_LCMS_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include - $ENV{DEVLIBS_PATH}//include// - PATH_SUFFIXES - lcms - ) - - find_library(LCMS_LIBRARY - NAMES - lcms - PATHS - ${_LCMS_LIBDIR} - /usr/lib - /usr/local/lib - /opt/local/lib - /sw/lib - ) - - if (LCMS_LIBRARY) - set(LCMS_FOUND TRUE) - endif (LCMS_LIBRARY) - - set(LCMS_INCLUDE_DIRS - ${LCMS_INCLUDE_DIR} - ) - - if (LCMS_FOUND) - set(LCMS_LIBRARIES - ${LCMS_LIBRARIES} - ${LCMS_LIBRARY} - ) - endif (LCMS_FOUND) - - if (LCMS_INCLUDE_DIRS AND LCMS_LIBRARIES) - set(LCMS_FOUND TRUE) - endif (LCMS_INCLUDE_DIRS AND LCMS_LIBRARIES) - - if (LCMS_FOUND) - if (NOT LCMS_FIND_QUIETLY) - message(STATUS "Found LCMS: ${LCMS_LIBRARIES}") - endif (NOT LCMS_FIND_QUIETLY) - else (LCMS_FOUND) - if (LCMS_FIND_REQUIRED) - message(FATAL_ERROR "Could not find LCMS") - endif (LCMS_FIND_REQUIRED) - endif (LCMS_FOUND) - - # show the LCMS_INCLUDE_DIRS and LCMS_LIBRARIES variables only in the advanced view - mark_as_advanced(LCMS_INCLUDE_DIRS LCMS_LIBRARIES) - -endif (LCMS_LIBRARIES AND LCMS_INCLUDE_DIRS) - |
