update git-version-tracking submodule, add json git infos to install interface, new verbose logs for install package with build info, update cmake/NablaConfig.cmake.in

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -292,6 +292,9 @@ option(GIT_EXCLUDE_IS_DIRTY "Exclude IS_DIRTY from git tracking checks, will inc
 add_subdirectory(git-version-tracking EXCLUDE_FROM_ALL)
 NBL_ADD_GIT_TRACKING_META_LIBRARY(nabla "${NBL_ROOT_PATH}")
 NBL_ADD_GIT_TRACKING_META_LIBRARY(dxc "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc")
+nbl_install_file("${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/nabla_git_info.json")
+nbl_install_file("${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/dxc_git_info.json")
+
 NBL_GENERATE_GIT_TRACKING_META()
 
 # NGFX

3rdparty/git-version-tracking

@@ -1,6 +1,32 @@
 @PACKAGE_INIT@
 
 set(Nabla_ROOT "${PACKAGE_PREFIX_DIR}")
+set(Nabla_GIT_INFO_JSON_FILE "${PACKAGE_PREFIX_DIR}/include/nabla_git_info.json")
+set(Nabla_DXC_GIT_INFO_JSON_FILE "${PACKAGE_PREFIX_DIR}/include/dxc_git_info.json")
+
+if(NOT EXISTS "${Nabla_GIT_INFO_JSON_FILE}")
+    message(FATAL_ERROR "Nabla: Git info JSON not found at \"${Nabla_GIT_INFO_JSON_FILE}\"")
+endif()
+
+if(NOT EXISTS "${Nabla_DXC_GIT_INFO_JSON_FILE}")
+    message(FATAL_ERROR "Nabla: DXC Git info JSON not found at \"${Nabla_DXC_GIT_INFO_JSON_FILE}\"")
+endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/NablaExportTargets.cmake")
-check_required_components(Nabla)
+check_required_components(Nabla)
+
+if(NABLA_FIND_PACKAGE_VERBOSE)
+  message(STATUS
+    "\n-- Nabla_ROOT = ${Nabla_ROOT}"
+    "\n-- Nabla_VERSION = ${Nabla_VERSION}"
+  )
+
+  file(READ "${Nabla_GIT_INFO_JSON_FILE}" _nabla_git_info_raw)
+  file(READ "${Nabla_DXC_GIT_INFO_JSON_FILE}" _nabla_dxc_git_info_raw)
+  message(STATUS
+    "-- Nabla module git info:"
+    "\n${_nabla_git_info_raw}"
+    "-- Nabla's DXC module git info:"
+    "\n${_nabla_dxc_git_info_raw}"
+  )
+endif()

cmake/NablaConfig.cmake.in

@@ -21,15 +21,11 @@ project(NablaSmoke CXX)
 
 # default hint for our CI, normally it needs to be path to package's directory where all autogen config .cmake scripts are
 set(PACKAGE_CONFIG_SEARCH_PATHS ${CMAKE_CURRENT_LIST_DIR}/build-ct/install/cmake ${PACKAGE_CONFIG_SEARCH_PATH_HINTS})
+set(NABLA_FIND_PACKAGE_VERBOSE ON)
 find_package(Nabla REQUIRED CONFIG 
     PATHS ${PACKAGE_CONFIG_SEARCH_PATHS}
 )
 
-message(STATUS
-    "\n-- Nabla_ROOT = ${Nabla_ROOT}"
-    "\n-- Nabla_VERSION = ${Nabla_VERSION}"
-)
-
 add_executable(smoke main.cpp pch.hpp cdb.ps1)
 target_link_libraries(smoke PRIVATE Nabla::Nabla)
 target_precompile_headers(smoke PRIVATE pch.hpp)