Skip to content
Permalink
Browse files

Bump yaml-cpp to avoid buggy version

  • Loading branch information...
SupSuper committed Apr 28, 2019
1 parent fa7a46e commit b86708f3ac41ea73ffa2e1d5518bf70d162c543b
Showing with 4 additions and 10 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 README.md
  3. +0 −6 cmake/modules/FindYaml_cpp.cmake
  4. +1 −1 configure.ac
  5. +1 −1 install/debian/control
@@ -61,7 +61,7 @@ if ( IS_DIRECTORY ${DEPS_DIR} )
set ( YAMLCPP_LIBRARY_DEBUG yaml-cppd )
else ( )
find_package ( SDL2 COMPONENTS mixer gfx image)
find_package ( Yaml_cpp 0.5.0)
find_package ( Yaml_cpp 0.5.3)
set ( YAMLCPP_LIBRARY_DEBUG ${YAMLCPP_LIBRARY} )

if ( NOT SDL_FOUND )
@@ -156,7 +156,7 @@ OpenXcom requires the following developer libraries:
- [SDL\_mixer](http://www.libsdl.org/projects/SDL_mixer/) (libsdl-mixer1.2)
- [SDL\_gfx](http://www.ferzkopp.net/joomla/content/view/19/14/) (libsdl-gfx1.2), version 2.0.22 or later
- [SDL\_image](http://www.libsdl.org/projects/SDL_image/) (libsdl-image1.2)
- [yaml-cpp](https://github.com/jbeder/yaml-cpp), version 0.5 or later
- [yaml-cpp](https://github.com/jbeder/yaml-cpp), version 0.5.3 or later

The source code includes files for the following build tools:

@@ -23,12 +23,6 @@
FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_YAMLCPP QUIET yaml-cpp)

# yaml-cpp 0.5.2 has issues that cause openxcom to fail to load any rules:
# See: https://github.com/jbeder/yaml-cpp/pull/316
if (PC_YAMLCPP_VERSION STREQUAL 0.5.2)
message(FATAL_ERROR "YAML-CPP 0.5.2 is known broken - please use either 0.5.1 or 0.5.3+")
endif()

FIND_PATH(YAMLCPP_INCLUDE_DIR yaml.h
HINTS
${PC_YAMLCPP_INCLUDEDIR}
@@ -101,7 +101,7 @@ AM_CONDITIONAL([WITH_OPENXCOM_MAN], [test "x$build_man" != "xno"])
# Check dependencies
# ==================
PKG_CHECK_MODULES([SDL],[sdl >= 1.2.13 SDL_mixer >= 1.2.11 SDL_gfx >= 2.0.22 SDL_image >= 1.2])
PKG_CHECK_MODULES([YAML],[yaml-cpp >= 0.5.0])
PKG_CHECK_MODULES([YAML],[yaml-cpp >= 0.5.3])
AX_CHECK_GL

AC_CONFIG_FILES([
@@ -9,7 +9,7 @@ Build-Depends:
libsdl-mixer1.2-dev,
libsdl-gfx1.2-dev,
libsdl-image1.2-dev,
libyaml-cpp-dev (>= 0.5),
libyaml-cpp-dev (>= 0.5.3),
libboost-dev
Standards-Version: 3.9.6
Homepage: https://openxcom.org/

0 comments on commit b86708f

Please sign in to comment.
You can’t perform that action at this time.