Skip to content

Commit 71e05ef

Browse files
mkalkbrennermkalkbrenner
committed
updated yaml-cpp to fix windows builds
1 parent 09087a8 commit 71e05ef

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎platforms/linux/aarch64/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ set -e
44

55
IO_BOARDS_SHA=f1a06654721f62f080441732d4c82d0a0c821582
66
LIBSERIALPORT_SHA=21b3dfe5f68c205be4086469335fd2fc2ce11ed2
7-
YAML_CPP_VERSION=0.8.0
7+
YAML_CPP_SHA=39f737443b05e4135e697cb91c2b7b18095acd53
88

99
NUM_PROCS=$(nproc)
1010

1111
echo "Building libraries..."
1212
echo " IO_BOARDS_SHA: ${IO_BOARDS_SHA}"
1313
echo " LIBSERIALPORT_SHA: ${LIBSERIALPORT_SHA}"
14-
echo " YAML_CPP_VERSION: ${YAML_CPP_VERSION}"
14+
echo " YAML_CPP_SHA: ${YAML_CPP_SHA}"
1515
echo " NUM_PROCS: ${NUM_PROCS}"
1616
echo ""
1717

@@ -49,10 +49,10 @@ cd ..
4949
# build libyaml-cpp and copy to platform/arch
5050
#
5151

52-
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.zip -o yaml-cpp.zip
52+
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_SHA}.zip -o yaml-cpp.zip
5353
unzip yaml-cpp.zip
5454

55-
cd yaml-cpp-${YAML_CPP_VERSION}
55+
cd yaml-cpp-${YAML_CPP_SHA}
5656
cp -r include/yaml-cpp ../../third-party/include/
5757
cmake -DYAML_BUILD_SHARED_LIBS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_FORMAT_SOURCE=OFF -B build
5858
cmake --build build --config Release

‎platforms/linux/x64/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ set -e
44

55
IO_BOARDS_SHA=f1a06654721f62f080441732d4c82d0a0c821582
66
LIBSERIALPORT_SHA=21b3dfe5f68c205be4086469335fd2fc2ce11ed2
7-
YAML_CPP_VERSION=0.8.0
7+
YAML_CPP_SHA=39f737443b05e4135e697cb91c2b7b18095acd53
88

99
NUM_PROCS=$(nproc)
1010

1111
echo "Building libraries..."
1212
echo " IO_BOARDS_SHA: ${IO_BOARDS_SHA}"
1313
echo " LIBSERIALPORT_SHA: ${LIBSERIALPORT_SHA}"
14-
echo " YAML_CPP_VERSION: ${YAML_CPP_VERSION}"
14+
echo " YAML_CPP_SHA: ${YAML_CPP_SHA}"
1515
echo " NUM_PROCS: ${NUM_PROCS}"
1616
echo ""
1717

@@ -49,10 +49,10 @@ cd ..
4949
# build libyaml-cpp and copy to platform/arch
5050
#
5151

52-
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.zip -o yaml-cpp.zip
52+
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_SHA}.zip -o yaml-cpp.zip
5353
unzip yaml-cpp.zip
5454

55-
cd yaml-cpp-${YAML_CPP_VERSION}
55+
cd yaml-cpp-${YAML_CPP_SHA}
5656
cp -r include/yaml-cpp ../../third-party/include/
5757
cmake -DYAML_BUILD_SHARED_LIBS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_FORMAT_SOURCE=OFF -B build
5858
cmake --build build --config Release

‎platforms/macos/arm64/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ set -e
44

55
IO_BOARDS_SHA=f1a06654721f62f080441732d4c82d0a0c821582
66
LIBSERIALPORT_SHA=21b3dfe5f68c205be4086469335fd2fc2ce11ed2
7-
YAML_CPP_VERSION=0.8.0
7+
YAML_CPP_SHA=39f737443b05e4135e697cb91c2b7b18095acd53
88

99
NUM_PROCS=$(sysctl -n hw.ncpu)
1010

1111
echo "Building libraries..."
1212
echo " IO_BOARDS_SHA: ${IO_BOARDS_SHA}"
1313
echo " LIBSERIALPORT_SHA: ${LIBSERIALPORT_SHA}"
14-
echo " YAML_CPP_VERSION: ${YAML_CPP_VERSION}"
14+
echo " YAML_CPP_SHA: ${YAML_CPP_SHA}"
1515
echo " NUM_PROCS: ${NUM_PROCS}"
1616
echo ""
1717

@@ -49,10 +49,10 @@ cd ..
4949
# build libyaml-cpp and copy to platform/arch
5050
#
5151

52-
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.zip -o yaml-cpp.zip
52+
curl -sL https://github.com/jbeder/yaml-cpp/archive/${YAML_CPP_SHA}.zip -o yaml-cpp.zip
5353
unzip yaml-cpp.zip
5454

55-
cd yaml-cpp-${YAML_CPP_VERSION}
55+
cd yaml-cpp-${YAML_CPP_SHA}
5656
cp -r include/yaml-cpp ../../third-party/include/
5757
cmake -DCMAKE_OSX_ARCHITECTURES=arm64 -DYAML_BUILD_SHARED_LIBS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_FORMAT_SOURCE=OFF -B build
5858
cmake --build build --config Release

‎platforms/macos/x64/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ set -e
44

55
IO_BOARDS_SHA=f1a06654721f62f080441732d4c82d0a0c821582
66
LIBSERIALPORT_SHA=21b3dfe5f68c205be4086469335fd2fc2ce11ed2
7-
YAML_CPP_VERSION=0.8.0
7+
YAML_CPP_SHA=39f737443b05e4135e697cb91c2b7b18095acd53
88

99
NUM_PROCS=$(sysctl -n hw.ncpu)
1010

1111
echo "Building libraries..."
1212
echo " IO_BOARDS_SHA: ${IO_BOARDS_SHA}"
1313
echo " LIBSERIALPORT_SHA: ${LIBSERIALPORT_SHA}"
14-
echo " YAML_CPP_VERSION: ${YAML_CPP_VERSION}"
14+
echo " YAML_CPP_SHA: ${YAML_CPP_SHA}"
1515
echo " NUM_PROCS: ${NUM_PROCS}"
1616
echo ""
1717

@@ -49,10 +49,10 @@ cd ..
4949
# build libyaml-cpp and copy to platform/arch
5050
#
5151

52-
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.zip -o yaml-cpp.zip
52+
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_SHA}.zip -o yaml-cpp.zip
5353
unzip yaml-cpp.zip
5454

55-
cd yaml-cpp-${YAML_CPP_VERSION}
55+
cd yaml-cpp-${YAML_CPP_SHA}
5656
cp -r include/yaml-cpp ../../third-party/include/
5757
cmake -DYAML_BUILD_SHARED_LIBS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_FORMAT_SOURCE=OFF -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64 -B build
5858
cmake --build build --config Release

‎platforms/win/x64/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ set -e
44

55
IO_BOARDS_SHA=f1a06654721f62f080441732d4c82d0a0c821582
66
LIBSERIALPORT_SHA=21b3dfe5f68c205be4086469335fd2fc2ce11ed2
7-
YAML_CPP_VERSION=0.8.0
7+
YAML_CPP_SHA=39f737443b05e4135e697cb91c2b7b18095acd53
88

99
echo "Building libraries..."
1010
echo " IO_BOARDS_SHA: ${IO_BOARDS_SHA}"
1111
echo " LIBSERIALPORT_SHA: ${LIBSERIALPORT_SHA}"
12-
echo " YAML_CPP_VERSION: ${YAML_CPP_VERSION}"
12+
echo " YAML_CPP_SHA: ${YAML_CPP_SHA}"
1313
echo ""
1414

1515
rm -rf external
@@ -46,10 +46,10 @@ cd ..
4646
# build libyaml-cpp and copy to platform/arch
4747
#
4848

49-
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.zip -o yaml-cpp.zip
49+
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_SHA}.zip -o yaml-cpp.zip
5050
unzip yaml-cpp.zip
5151

52-
cd yaml-cpp-${YAML_CPP_VERSION}
52+
cd yaml-cpp-${YAML_CPP_SHA}
5353
cp -r include/yaml-cpp ../../third-party/include/
5454
cmake -G "Visual Studio 17 2022" -DYAML_BUILD_SHARED_LIBS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_FORMAT_SOURCE=OFF -B build
5555
cmake --build build --config Release

‎platforms/win/x86/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ set -e
44

55
IO_BOARDS_SHA=f1a06654721f62f080441732d4c82d0a0c821582
66
LIBSERIALPORT_SHA=21b3dfe5f68c205be4086469335fd2fc2ce11ed2
7-
YAML_CPP_VERSION=0.8.0
7+
YAML_CPP_SHA=39f737443b05e4135e697cb91c2b7b18095acd53
88

99
echo "Building libraries..."
1010
echo " IO_BOARDS_SHA: ${IO_BOARDS_SHA}"
1111
echo " LIBSERIALPORT_SHA: ${LIBSERIALPORT_SHA}"
12-
echo " YAML_CPP_VERSION: ${YAML_CPP_VERSION}"
12+
echo " YAML_CPP_SHA: ${YAML_CPP_SHA}"
1313
echo ""
1414

1515
rm -rf external
@@ -44,10 +44,10 @@ cd ..
4444
# build libyaml-cpp and copy to platform/arch
4545
#
4646

47-
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.zip -o yaml-cpp.zip
47+
curl -sL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_SHA}.zip -o yaml-cpp.zip
4848
unzip yaml-cpp.zip
4949

50-
cd yaml-cpp-${YAML_CPP_VERSION}
50+
cd yaml-cpp-${YAML_CPP_SHA}
5151
cp -r include/yaml-cpp ../../third-party/include/
5252
cmake -G "Visual Studio 17 2022" -A Win32 -DYAML_BUILD_SHARED_LIBS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_FORMAT_SOURCE=OFF -B build
5353
cmake --build build --config Release

0 commit comments

Comments
 (0)