Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FormerLurker/ArcWelderLib.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFormerLurker <hochgebe@gmail.com>2020-11-28 19:49:59 +0300
committerFormerLurker <hochgebe@gmail.com>2020-11-28 19:49:59 +0300
commita63b13b326774d97856d55976daff6e6048b07bb (patch)
treecd28e576b919e9f9a534907776ca3814ffe664f5
parentf89e30660e82df0d9ea2f704aafce833d413ff13 (diff)
Fix cmake generated copy
-rw-r--r--GcodeProcessorLib/CMakeLists.txt2
-rw-r--r--GcodeProcessorLib/deploy/version.h8
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