From a63b13b326774d97856d55976daff6e6048b07bb Mon Sep 17 00:00:00 2001 From: FormerLurker Date: Sat, 28 Nov 2020 10:49:59 -0600 Subject: Fix cmake generated copy --- GcodeProcessorLib/CMakeLists.txt | 2 +- GcodeProcessorLib/deploy/version.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GcodeProcessorLib/CMakeLists.txt b/GcodeProcessorLib/CMakeLists.txt index 8cc89bf..4ed0251 100644 --- a/GcodeProcessorLib/CMakeLists.txt +++ b/GcodeProcessorLib/CMakeLists.txt @@ -52,7 +52,7 @@ configure_file( include_directories("${CMAKE_BINARY_DIR}/GcodeProcessorLib/generated/") # copy version.h file to the source folder for later deployment -file(COPY "${CMAKE_BINARY_DIR}/GcodeProcessorLib/version.generated.h" DESTINATION "${PROJECT_SOURCE_DIR}/deploy") +file(COPY "${CMAKE_BINARY_DIR}/GcodeProcessorLib/generated/version.generated.h" DESTINATION "${PROJECT_SOURCE_DIR}/deploy") file(RENAME "${PROJECT_SOURCE_DIR}/deploy/version.generated.h" "${PROJECT_SOURCE_DIR}/deploy/version.h") option(USE_CXX_EXCEPTIONS "Enable C++ exception support" ON) diff --git a/GcodeProcessorLib/deploy/version.h b/GcodeProcessorLib/deploy/version.h index b418130..10f2b57 100644 --- a/GcodeProcessorLib/deploy/version.h +++ b/GcodeProcessorLib/deploy/version.h @@ -1,12 +1,12 @@ // In version.h.in #ifndef VERSION_GENERATED_H -#define VERSION_GENERATED_H + #define VERSION_GENERATED_H #define GIT_BRANCH "devel" - #define GIT_COMMIT_HASH "7da85eb" - #define GIT_TAGGED_VERSION "0.1.0-11-g7da85eb" + #define GIT_COMMIT_HASH "f89e306" + #define GIT_TAGGED_VERSION "0.1.0-12-gf89e306" #define GIT_TAG "0.1.0" - #define BUILD_DATE "2020-11-28T16:09:44Z" + #define BUILD_DATE "2020-11-28T16:49:35Z" #define COPYRIGHT_DATE "2020" #define AUTHOR "Brad Hochgesang" #endif -- cgit v1.2.3