Collect vcpkg hash and date of it

Switched cmake helper script source.
mwthinker · Aug 17, 2024 · 801c24f · 801c24f
1 parent ec2a6ea
commit 801c24f
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,10 +44,23 @@ find_package(CppSdl2 REQUIRED)
 find_package(Signal REQUIRED)
 find_package(Calculator REQUIRED)
 
-extract_git_hash()
-create_guid()
+extract_git_hash(
+	${CMAKE_CURRENT_SOURCE_DIR}
+	GIT_HASH
+	GIT_DATE
+)
+extract_git_hash(
+	$ENV{VCPKG_ROOT}
+	VCPKG_HASH
+	VCPKG_DATE
+)
+create_guid_from_source(
+	${CMAKE_CURRENT_SOURCE_DIR}
+	GUID
+)
 
-message(STATUS "GIT_HASH: ${GIT_HASH}")
+message(STATUS "VCPKG_HASH: ${VCPKG_HASH} ${VCPKG_DATE}")
+message(STATUS "GIT_HASH: ${GIT_HASH} ${GIT_DATE}")
 message(STATUS "CMAKE_PROJECT_VERSION: ${CMAKE_PROJECT_VERSION}")
 message(STATUS "GUID: ${GUID}")
 
@@ -138,7 +151,10 @@ target_link_libraries(MWetris
 target_compile_definitions(MWetris
 	PRIVATE
 		GIT_VERSION="${GIT_HASH}"
+		GIT_DATE="${GIT_DATE}"
 		PROJECT_VERSION="${PROJECT_VERSION}"
+		VCPKG_HASH="${VCPKG_HASH}"
+		VCPKG_DATE="${VCPKG_DATE}"
 )
 
 set_target_properties(MWetris

diff --git a/ExternalFetchContent.cmake b/ExternalFetchContent.cmake
@@ -36,18 +36,18 @@ FetchContent_Declare(Calculator
 	OVERRIDE_FIND_PACKAGE
 )
 
-FetchContent_Declare(CmakeAuxiliary
+FetchContent_Declare(CMakeHelper
 	GIT_REPOSITORY
-		https://gist.github.com/mwthinker/e0539b200e3f0ac6da545af4843a6ff6
+		https://github.com/mwthinker/CMakeHelper.git
 	GIT_TAG
-		0f0aaa9201a5a4c11749cd5adfc496a3960014de
+		a321588de57895a85e642810b6eedc5cbf89c0ea
 )
-FetchContent_MakeAvailable(CmakeAuxiliary)
-FetchContent_GetProperties(CmakeAuxiliary
+FetchContent_MakeAvailable(CMakeHelper)
+FetchContent_GetProperties(CMakeHelper
 	SOURCE_DIR
-		CmakeAuxiliary_SOURCE_DIR
+		CMakeHelper_SOURCE_DIR
 )
-include(${CmakeAuxiliary_SOURCE_DIR}/auxiliary.cmake)
+include(${CMakeHelper_SOURCE_DIR}/auxiliary.cmake)
 
 # Load data.
 FetchContent_Declare(MWetrisData

diff --git a/MWetris_Lib/CMakeLists.txt b/MWetris_Lib/CMakeLists.txt
@@ -142,19 +142,15 @@ target_include_directories(MWetris_Lib
 target_compile_definitions(MWetris_Lib
 	PUBLIC
 		GIT_VERSION="${GIT_HASH}"
+		GIT_DATE="${GIT_DATE}"
+		VCPKG_HASH="${VCPKG_HASH}"
+		VCPKG_DATE="${VCPKG_DATE}"
 		PROJECT_VERSION="${CMAKE_PROJECT_VERSION}"
 		MWETRIS_GUID="${GUID}"
-)
 
-# ASIO non-boost version.
-target_compile_definitions(MWetris_Lib
-	PUBLIC
+		# ASIO non-boost version.
 		ASIO_STANDALONE
 		ASIO_NO_DEPRECATED
-)
-target_compile_definitions(MWetris_Lib
-	PUBLIC
-		ASIO_NO_DEPRECATED
 		ASIO_NO_DYNAMIC_BUFFER_V1
 )
 

diff --git a/MWetris_Lib/src/mwetris/ui/scene/about.cpp b/MWetris_Lib/src/mwetris/ui/scene/about.cpp
@@ -26,8 +26,9 @@ namespace mwetris::ui::scene {
 			}
 		}
 		ImGui::NewLine();
-		ImGui::Text("Version: v%s", PROJECT_VERSION);
-		ImGui::Text("Git Hash: %s", GIT_VERSION);
+		ImGui::Text("Version:  v%s", PROJECT_VERSION);
+		ImGui::Text("Git hash: %s  date:  %s", GIT_VERSION, GIT_DATE);
+		ImGui::Text("Vcpkg hash: %s  date:  %s", VCPKG_HASH, VCPKG_DATE);
 		ImGui::NewLine();
 		ImGui::Text("GUID: %s", MWETRIS_GUID);
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -16,7 +16,8 @@ template <> struct fmt::formatter<argparse::ArgumentParser> : fmt::ostream_forma
 void startApplication(MainWindow::Config& config) {
 	mwetris::logger::init();
 	spdlog::info("[main] MWetris Version:  {}", PROJECT_VERSION);
-	spdlog::info("[main] MWetris git hash:  {}", GIT_VERSION);
+	spdlog::info("[main] MWetris git hash:  {}  date: {}", GIT_VERSION, GIT_DATE);
+	spdlog::info("[main] MWetris vcpkg hash:  {}  date: {}", VCPKG_HASH, VCPKG_DATE);
 	spdlog::info("[main] MWetris GUI:  {}", MWETRIS_GUID);
 
 	const sdl::InitSdl SDL{SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER};