diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-05 20:45:34 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-05 21:22:02 +0000 |
| commit | 5dc92fdb2456b6d7acd491f1d3671e5b93fc559f (patch) | |
| tree | ef01837377ff11329954d6bbb24904130a17914d /CMakeScripts | |
| parent | complete TextToolbar migration merge (diff) | |
| download | inkscape-5dc92fdb2456b6d7acd491f1d3671e5b93fc559f.tar.gz inkscape-5dc92fdb2456b6d7acd491f1d3671e5b93fc559f.zip | |
Remove unused libyaml dependency
This was required by xverbs, which were removed in
db05b842cba28f01b431eee890537959aa2d8fe3
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 12 | ||||
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 1 | ||||
| -rw-r--r-- | CMakeScripts/Modules/Findyaml.cmake | 49 |
3 files changed, 0 insertions, 62 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e0afe784d..bef04ccb7 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -347,18 +347,6 @@ pkg_check_modules(SIGC++ REQUIRED sigc++-2.0 ) list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS}) list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER}) -if(WITH_YAML) - find_package(yaml) - if(YAML_FOUND) - set (WITH_YAML ON) - list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES}) - else(YAML_FOUND) - set(WITH_YAML OFF) - message(STATUS "Could not locate the yaml library headers: xverb feature will be disabled") - endif() -endif() - list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS) foreach(flag ${INKSCAPE_CXX_FLAGS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE) diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index b6456e533..f19f19417 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -116,7 +116,6 @@ if(WIN32) ${MINGW_BIN}/libwpg-0.[0-9]*.dll
${MINGW_BIN}/libxml2-[0-9]*.dll
${MINGW_BIN}/libxslt-[0-9]*.dll
- ${MINGW_BIN}/libyaml-0-[0-9]*.dll
${MINGW_BIN}/libzstd.dll
${MINGW_BIN}/nss[0-9]*.dll
${MINGW_BIN}/nssutil[0-9]*.dll
diff --git a/CMakeScripts/Modules/Findyaml.cmake b/CMakeScripts/Modules/Findyaml.cmake deleted file mode 100644 index 154f2ed43..000000000 --- a/CMakeScripts/Modules/Findyaml.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# - Try to find the YAML library -# Once done this will define -# -# YAML_FOUND - system has yaml -# YAML_INCLUDE_DIR - the yaml include directory -# YAML_LIBRARIES - the libraries needed to use yaml - -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (YAML_INCLUDE_DIR AND YAML_LIBRARIES) - # in cache already - SET(YAML_FOUND TRUE) -else (YAML_INCLUDE_DIR AND YAML_LIBRARIES) - IF (NOT WIN32) - FIND_PACKAGE(PkgConfig) - IF (PKG_CONFIG_FOUND) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - pkg_check_modules(_YAML_PC QUIET yaml-1) - ENDIF (PKG_CONFIG_FOUND) - ENDIF (NOT WIN32) - - FIND_PATH(YAML_INCLUDE_DIR yaml.h - /usr/include - /usr/local/include - ) - - FIND_LIBRARY(YAML_LIBRARIES NAMES yaml - PATHS) - - if (YAML_INCLUDE_DIR AND YAML_LIBRARIES) - set(YAML_FOUND TRUE) - endif (YAML_INCLUDE_DIR AND YAML_LIBRARIES) - - - if (YAML_FOUND) - if (NOT YAML_FIND_QUIETLY) - message(STATUS "Found YAML: ${YAML_LIBRARIES}") - endif (NOT YAML_FIND_QUIETLY) - else (YAML_FOUND) - if (YAML_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find YAML") - endif (YAML_FIND_REQUIRED) - endif (YAML_FOUND) - - MARK_AS_ADVANCED(YAML_INCLUDE_DIR YAML_LIBRARIES) - -endif (YAML_INCLUDE_DIR AND YAML_LIBRARIES) |
