diff options
| -rw-r--r-- | CMakeScripts/Modules/Findyaml.cmake | 74 | ||||
| -rw-r--r-- | src/main-cmdlineact.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
3 files changed, 36 insertions, 42 deletions
diff --git a/CMakeScripts/Modules/Findyaml.cmake b/CMakeScripts/Modules/Findyaml.cmake index d3f00cd13..154f2ed43 100644 --- a/CMakeScripts/Modules/Findyaml.cmake +++ b/CMakeScripts/Modules/Findyaml.cmake @@ -9,45 +9,41 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. if (YAML_INCLUDE_DIR AND YAML_LIBRARIES) - - # in cache already - SET(YAML_FOUND TRUE) - + # 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) + 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) diff --git a/src/main-cmdlineact.cpp b/src/main-cmdlineact.cpp index fc0f50cd4..f5c6e52eb 100644 --- a/src/main-cmdlineact.cpp +++ b/src/main-cmdlineact.cpp @@ -57,8 +57,6 @@ CmdLineAction::doIt (ActionContext const & context) { //printf("Doing: %s\n", _arg); if (_isVerb) { if (isExtended()) { - //printf("Is extended\n"); - doItX(context); return; } diff --git a/src/main.cpp b/src/main.cpp index 5b7dcc5ef..0d5f35797 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -308,7 +308,7 @@ struct poptOption options[] = { N_("Open specified document(s) (option string may be excluded)"), N_("FILENAME")}, #ifdef WITH_YAML - {"xverbs", 0, + {"xverbs", 0, POPT_ARG_STRING, &sp_xverbs_yaml, SP_ARG_XVERBS, N_("xverbs command"), N_("XVERBS_FILENAME")}, |