Skip to content

Commit

Permalink
Bugfix: Build broken by deprecation of old yaml-cpp backend
Browse files Browse the repository at this point in the history
Import new yaml-cpp from original maintainer and update all systems to use it

Bumps yaml-cpp version

Make the build scripts use new yaml-cpp

Turns off some options in new yaml-cpp
  • Loading branch information
argiopetech committed Oct 11, 2018
1 parent f59b060 commit a9efb9a
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "yaml-cpp"]
path = yaml-cpp
url = https://github.com/argiopetech/yaml-cpp.git
url = https://github.com/jbeder/yaml-cpp.git
5 changes: 5 additions & 0 deletions CMakeLists.txt
Expand Up @@ -117,7 +117,12 @@ include_directories(base9)
include_directories(yaml-cpp/include)

# Libraries

option(YAML_CPP_BUILD_TESTS "Enable testing" OFF)
option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF)
option(YAML_CPP_BUILD_CONTRIB "Enable contrib stuff in library" OFF)
add_subdirectory(yaml-cpp)

add_subdirectory(base9)

# Applications
Expand Down
1 change: 1 addition & 0 deletions base9/Cluster.cpp
@@ -1,3 +1,4 @@
#include <cmath>
#include <cstdio>

#include "Cluster.hpp"
Expand Down
4 changes: 1 addition & 3 deletions build.sh
Expand Up @@ -26,12 +26,10 @@ else
if [ ! -e "yaml-cpp/CMakeLists.txt" ]; then
# Manually clone yaml-cpp, removing the directory first
rm -r yaml-cpp
git clone https://github.com/argiopetech/yaml-cpp.git --depth 1
git clone --depth=1 --branch=yaml-cpp-0.6.2 https://github.com/jbeder/yaml-cpp.git
fi
fi

cp cmake/yaml-cpp-CMakeLists.txt yaml-cpp/CMakeLists.txt

cd ./BUILD
if [ "$PREFIX" ]; then
cmake -DCMAKE_BUILD_TYPE="RELEASE" -DCMAKE_INSTALL_PREFIX=$PREFIX ..
Expand Down
25 changes: 0 additions & 25 deletions contrib/CMakeLists.txt

This file was deleted.

4 changes: 1 addition & 3 deletions debug_build.sh
Expand Up @@ -26,12 +26,10 @@ else
if [ ! -e "yaml-cpp/CMakeLists.txt" ]; then
# Manually clone yaml-cpp, removing the directory first
rm -r yaml-cpp
git clone https://github.com/argiopetech/yaml-cpp.git --depth 1
git clone --depth=1 --branch=yaml-cpp-0.6.2 https://github.com/jbeder/yaml-cpp.git
fi
fi

cp cmake/yaml-cpp-CMakeLists.txt yaml-cpp/CMakeLists.txt

cd ./BUILD
cmake -DCMAKE_BUILD_TYPE="RELWITHDEBINFO" -DCMAKE_INSTALL_PREFIX='.' ..
make -j"$NCPUS"
Expand Down
2 changes: 2 additions & 0 deletions makeCMD/makeCMD.cpp
@@ -1,3 +1,4 @@
#include <cmath>
#include <fstream>
#include <iostream>
#include <memory>
Expand All @@ -14,6 +15,7 @@

using std::cerr;
using std::endl;
using std::fabs;
using std::ofstream;
using std::string;
using std::unique_ptr;
Expand Down
2 changes: 2 additions & 0 deletions makeCMD/makeCMDs.cpp
@@ -1,4 +1,5 @@
#include <algorithm>
#include <cmath>
#include <fstream>
#include <iostream>
#include <memory>
Expand All @@ -16,6 +17,7 @@

using std::cerr;
using std::endl;
using std::fabs;
using std::stringstream;
using std::ofstream;
using std::string;
Expand Down
2 changes: 1 addition & 1 deletion yaml-cpp

0 comments on commit a9efb9a

Please sign in to comment.