chore(cpn): Bump yaml-cpp to version 0.8.0 (#4246)
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
raphaelcoeffic
parent
51aa5a8f1b
commit
c85b444a14
@@ -1,9 +1,6 @@
|
|||||||
[submodule "radio/src/thirdparty/AccessDenied"]
|
[submodule "radio/src/thirdparty/AccessDenied"]
|
||||||
path = radio/src/thirdparty/AccessDenied
|
path = radio/src/thirdparty/AccessDenied
|
||||||
url = https://github.com/raphaelcoeffic/AccessDenied.git
|
url = https://github.com/raphaelcoeffic/AccessDenied.git
|
||||||
[submodule "companion/src/thirdparty/yaml-cpp"]
|
|
||||||
path = companion/src/thirdparty/yaml-cpp
|
|
||||||
url = https://github.com/jbeder/yaml-cpp.git
|
|
||||||
[submodule "radio/src/thirdparty/FreeRTOS"]
|
[submodule "radio/src/thirdparty/FreeRTOS"]
|
||||||
path = radio/src/thirdparty/FreeRTOS
|
path = radio/src/thirdparty/FreeRTOS
|
||||||
url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
|
url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# Fetch yaml-cpp
|
||||||
|
|
||||||
|
include(FetchContent)
|
||||||
|
|
||||||
|
FetchContent_Declare(
|
||||||
|
yaml-cpp
|
||||||
|
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
|
||||||
|
GIT_TAG f7320141120f720aecc4c32be25586e7da9eb978 # v0.8.0
|
||||||
|
)
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(yaml-cpp)
|
||||||
|
message("Fetched yaml-cpp source code from Github: ${yaml-cpp_SOURCE_DIR}")
|
||||||
@@ -182,6 +182,7 @@ set(CPN_COMMON_LIB common)
|
|||||||
############# Supporting libraries ###############
|
############# Supporting libraries ###############
|
||||||
|
|
||||||
include(FetchMiniz)
|
include(FetchMiniz)
|
||||||
|
include(FetchYamlCpp)
|
||||||
|
|
||||||
include(FetchMaxLibQt)
|
include(FetchMaxLibQt)
|
||||||
|
|
||||||
@@ -195,12 +196,6 @@ add_subdirectory(storage)
|
|||||||
add_subdirectory(thirdparty/qcustomplot)
|
add_subdirectory(thirdparty/qcustomplot)
|
||||||
add_subdirectory(updates)
|
add_subdirectory(updates)
|
||||||
|
|
||||||
set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
|
|
||||||
set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
|
|
||||||
set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "Enable contrib stuff in library" FORCE)
|
|
||||||
set(YAML_CPP_INSTALL OFF CACHE BOOL "Enable generation of install target" FORCE)
|
|
||||||
add_subdirectory(thirdparty/yaml-cpp)
|
|
||||||
|
|
||||||
############# Companion ###############
|
############# Companion ###############
|
||||||
|
|
||||||
include_directories(${maxLibQt_SOURCE_DIR}/widgets)
|
include_directories(${maxLibQt_SOURCE_DIR}/widgets)
|
||||||
|
|||||||
@@ -73,7 +73,6 @@ target_include_directories(firmwares
|
|||||||
PRIVATE
|
PRIVATE
|
||||||
${CMAKE_SOURCE_DIR}
|
${CMAKE_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
${COMPANION_SRC_DIRECTORY}/thirdparty/yaml-cpp/include
|
|
||||||
PUBLIC
|
PUBLIC
|
||||||
"${CMAKE_CURRENT_LIST_DIR}"
|
"${CMAKE_CURRENT_LIST_DIR}"
|
||||||
"${CMAKE_CURRENT_LIST_DIR}/er9x"
|
"${CMAKE_CURRENT_LIST_DIR}/er9x"
|
||||||
|
|||||||
Vendored
-1
Submodule companion/src/thirdparty/yaml-cpp deleted from 1b50109f7b
Reference in New Issue
Block a user