diff options
| author | Dmitry Zhulanov <dmitry.zhulanov@gmail.com> | 2016-10-01 06:05:10 +0000 |
|---|---|---|
| committer | Dmitry Zhulanov <dmitry.zhulanov@gmail.com> | 2016-10-01 06:05:10 +0000 |
| commit | 81364db0bc98b01319dc5ecb835a4e37b906bad2 (patch) | |
| tree | 405d5268db023f160154240d074f4ba4f5d60136 /CMakeScripts | |
| parent | allow to use verbs as xverbs (diff) | |
| download | inkscape-81364db0bc98b01319dc5ecb835a4e37b906bad2.tar.gz inkscape-81364db0bc98b01319dc5ecb835a4e37b906bad2.zip | |
disable xverb feature if WITH_YAML defined
(bzr r15136.1.9)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 13 | ||||
| -rw-r--r-- | CMakeScripts/Modules/Findyaml.cmake | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 726e5d5db..daf5afd90 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -387,9 +387,16 @@ list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS}) list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER}) -find_package(yaml REQUIRED) -list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS}) -list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES}) +find_package(yaml) +if(YAML_FOUND) + set (WITH_YAML ON) + list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES}) + add_definitions(-DWITH_YAML) +else(YAML_FOUND) + unset(WITH_YAML OFF) + message(STATUS "Could not locate the yaml library headers: xverb feature will be disabled") +endif() list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS) foreach(flag ${INKSCAPE_CXX_FLAGS}) diff --git a/CMakeScripts/Modules/Findyaml.cmake b/CMakeScripts/Modules/Findyaml.cmake index 0324c6b83..d3f00cd13 100644 --- a/CMakeScripts/Modules/Findyaml.cmake +++ b/CMakeScripts/Modules/Findyaml.cmake @@ -24,7 +24,7 @@ else (YAML_INCLUDE_DIR AND YAML_LIBRARIES) ENDIF (PKG_CONFIG_FOUND) ENDIF (NOT WIN32) - FIND_PATH(YAML_INCLUDE_DIR yaml123.h + FIND_PATH(YAML_INCLUDE_DIR yaml.h /usr/include /usr/local/include ) |