Skip to content

Update release to 0.6.3 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
olivier-stasse wants to merge 2 commits into from
+13 −16
Closed

Update release to 0.6.3 #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8369623
Update release to 0.6.3
olivier-stasse Dec 16, 2020
7f5e517
Add YAML_BUILD_SHARED_LIBS in parameters
olivier-stasse Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ macro(build_yaml_cpp)
list(APPEND YAML_CXX_FLAGS "-std=c++14 -w")
endif()

list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TESTS=OFF")
list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TOOLS=OFF")
list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_CONTRIB=OFF")
list(APPEND extra_cmake_args "-DBUILD_SHARED_LIBS=ON")
list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
list(APPEND extra_cmake_args "-DCMAKE_C_FLAGS=${YAML_C_FLAGS}")
list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
list(APPEND extra_cmake_args "-DCMAKE_CXX_FLAGS=${YAML_CXX_FLAGS}")
list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TESTS:BOOL=OFF")
list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TOOLS:BOOL=OFF")
list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_CONTRIB:BOOL=OFF")
list(APPEND extra_cmake_args "-DYAML_BUILD_SHARED_LIBS:BOOL=ON")
list(APPEND extra_cmake_args "-DBUILD_SHARED_LIBS:BOOL=ON")
list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}")
list(APPEND extra_cmake_args "-DCMAKE_C_FLAGS:STRING=${YAML_C_FLAGS}")
list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}")
list(APPEND extra_cmake_args "-DCMAKE_CXX_FLAGS:STRING=${YAML_CXX_FLAGS}")

if(WIN32 AND NOT ${CMAKE_VERBOSE_MAKEFILE})
set(should_log ON) # prevent warnings in Windows CI
Expand All @@ -39,14 +40,10 @@ macro(build_yaml_cpp)
endif()

include(ExternalProject)
# This specific version (past the current latest release of 0.5.3) is required to make
# yaml-cpp relocatable, hopefully it is released again soon.
# See: https://github.com/jbeder/yaml-cpp/pull/538
# Latest release fails to compile on recent visual studio (VS2017 v15.8.1)
# See: https://github.com/jbeder/yaml-cpp/pull/597
ExternalProject_Add(yaml_cpp-0f9a586
URL https://github.com/jbeder/yaml-cpp/archive/0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79.zip
URL_MD5 ec76c27ebd07d5178cbe85b773df8e62

ExternalProject_Add(yaml_cpp-9a36242
URL https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.zip
URL_MD5 e8a182537af663cc45228f7064b2021c
TIMEOUT 600
LOG_CONFIGURE ${should_log}
LOG_BUILD ${should_log}
Expand Down