Merge branch 'main' into mqtt_cunit

xmidt-org · Sep 7, 2023 · f32edff · f32edff
2 parents b90f49a + f32bd12
commit f32edff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Install packages
       run: |
         sudo apt update
-        sudo apt-get -y install valgrind libcunit1 libcunit1-doc libcunit1-dev libmsgpack-dev gcovr libtool
+        sudo apt-get -y install valgrind libcunit1 libcunit1-doc libcunit1-dev libmsgpack-dev gcovr libtool xsltproc docbook-xsl libcjson-dev
  
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,6 +88,7 @@ add_dependencies(libcJSON cJSON)
 # rbus external dependency
 #-------------------------------------------------------------------------------
 ExternalProject_Add(rbus
+     DEPENDS cJSON
      PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/rbus
      GIT_REPOSITORY https://github.com/rdkcentral/rbus.git
      GIT_TAG main