chores(cpn): fetch yaml-cpp via cmake

EdgeTX · Oct 27, 2023 · e143531 · e143531
1 parent 973da85
commit e143531
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "radio/src/thirdparty/AccessDenied"]
 	path = radio/src/thirdparty/AccessDenied
 	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"]
 	path = radio/src/thirdparty/FreeRTOS
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git

diff --git a/cmake/FetchYamlCpp.cmake b/cmake/FetchYamlCpp.cmake
@@ -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}")
diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
@@ -184,6 +184,7 @@ set(CPN_COMMON_LIB common)
 ############# Supporting libraries ###############
 
 include(FetchMiniz)
+include(FetchYamlCpp)
 
 add_subdirectory(datamodels)
 add_subdirectory(firmwares)
@@ -196,12 +197,6 @@ add_subdirectory(thirdparty/qcustomplot)
 add_subdirectory(thirdparty/maxlibqt/src/widgets)
 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 ###############
 
 set(companion_SRCS

diff --git a/companion/src/firmwares/CMakeLists.txt b/companion/src/firmwares/CMakeLists.txt
@@ -73,7 +73,6 @@ target_include_directories(firmwares
   PRIVATE
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${COMPANION_SRC_DIRECTORY}/thirdparty/yaml-cpp/include
   PUBLIC
     "${CMAKE_CURRENT_LIST_DIR}"
     "${CMAKE_CURRENT_LIST_DIR}/er9x"

diff --git a/companion/src/thirdparty/yaml-cpp b/companion/src/thirdparty/yaml-cpp