Merge pull request #2187 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev27
nasa · Oct 26, 2022 · 7a220ae · 7a220ae
2 parents be88a07 + f0f6c21
commit 7a220ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev201
+- use osal_public_api header targets in doc
+- See <https://github.com/nasa/cFE/pull/2184>
+
 ## Development Build: v7.0.0-rc4+dev197
 - Remove Changelog in Doxygen Config
 - See <https://github.com/nasa/cFE/pull/2165>

diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake
@@ -322,12 +322,12 @@ function(prepare)
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/docs/cfe-usersguide")
 
   # OSAL API GUIDE include PUBLIC API
-  set(OSAL_API_INCLUDE_DIRECTORIES
-    "${osal_MISSION_DIR}/src/os/inc"
-    "${CMAKE_BINARY_DIR}/docs"
-  )
+  add_subdirectory(${osal_MISSION_DIR} osal_public_api)
   add_subdirectory(${osal_MISSION_DIR}/docs/src ${CMAKE_BINARY_DIR}/docs/osal-apiguide)
 
+  add_dependencies(cfe-usersguide osal_public_api_headerlist)
+  add_dependencies(mission-doc osal_public_api_headerlist)
+
   # Pull in any application-specific mission-scope configuration
   # This may include user configuration files such as cfe_mission_cfg.h,
   # msgid definitions, or any other configuration/preparation that needs to

diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   197 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   201 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */