build system tweaks

.gitignore

@@ -1,78 +1,3 @@
-# Created by https://www.gitignore.io
-
-### Vim ###
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-*~
-
-
-### CMake ###
-CMakeCache.txt
-CMakeFiles
-Makefile
-cmake_install.cmake
-install_manifest.txt
-
-
-### C++ ###
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-#*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-*.dcu
-*.~cpp
-*.~h
-*.~bpr
-*.~pas
-*.opensdf
-*.sdf
-*.sln
-#*.vcxproj
-#*.filters
-format_all_files.py
-*.suo
-EU07.tds
-*.opendb
-*.db
-.vs/
-Debug/
-tmp/
-bin/
-ipch/
-#ref/
-*.aps
-
 builds/
-
 CMakeLists.txt.user
-version_info.h
-
 ci_shadervalidator/validateshaders

CMakeLists.txt

@@ -27,7 +27,8 @@ include_directories("."
 "McZapkie"
 "gl"
 "ref/glad/include"
-"ref/dds-ktx/include")
+"ref/dds-ktx/include"
+"${CMAKE_BINARY_DIR}/geninc")
 
 file(GLOB HEADERS "*.h"
 "Console/*.h"
@@ -243,25 +244,36 @@ endif()
 
 set(SOURCES ${SOURCES} "extras/piped_proc.cpp" "widgets/cameraview_extcam.cpp")
 
-find_package(Git REQUIRED)
+find_package(Git)
 
-string(TIMESTAMP BUILD_DATE %y%m%d)
+if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+	execute_process(
+	  COMMAND ${GIT_EXECUTABLE} describe --match=DUMMY --always --dirty
+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	  OUTPUT_VARIABLE GIT_HASH
+	  OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
 
-execute_process(
-  COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_BRANCH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+    execute_process(
+	  COMMAND ${GIT_EXECUTABLE} show -s --format=%ci
+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	  OUTPUT_VARIABLE SRC_DATE
+	  OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
 
-execute_process(
-  COMMAND ${GIT_EXECUTABLE} describe --match=DUMMY --always --dirty
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_HASH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+    execute_process(
+	  COMMAND ${GIT_EXECUTABLE} show -s --format=%cs
+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	  OUTPUT_VARIABLE SRC_SHORT_DATE
+	  OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+else()
+	string(TIMESTAMP SRC_SHORT_DATE %Y-%m-%d UTC)
+	string(TIMESTAMP SRC_DATE UTC)
+	set(GIT_HASH "(unknown)")
+endif()
 
-configure_file("${CMAKE_SOURCE_DIR}/version_info.h.in" "${CMAKE_SOURCE_DIR}/version_info.h")
+configure_file("${CMAKE_SOURCE_DIR}/version_info.h.in" "${CMAKE_BINARY_DIR}/geninc/version_info.h")
 
 set (PREFIX "")
 
@@ -327,7 +339,7 @@ set_target_properties( ${PROJECT_NAME}
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
     PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/pdb"
-        OUTPUT_NAME "${PROJECT_NAME}${PREFIX}_${BUILD_DATE}"
+	OUTPUT_NAME "${PROJECT_NAME}${PREFIX}_${SRC_SHORT_DATE}"
 	DEBUG_POSTFIX "_d"
 )
 

version_info.h.in

@@ -1 +1 @@
-#define VERSION_INFO "EU07 (cmake), @GIT_BRANCH@/@GIT_HASH@, built on @BUILD_DATE@"
+#define VERSION_INFO "EU07 (cmake), @GIT_HASH@ (committed at @SRC_DATE@)"