Skip to content

Commit bf10935

Browse files
committed
Fixes to latest changes.
1 parent 8cdc7b5 commit bf10935

3 files changed

Lines changed: 8 additions & 19 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
imgui.ini
1919
CMakeCache.txt
2020
cmake_install.cmake
21+
FEBasicApplicationVersion.h
2122

2223
#Folders
2324
Debug/

FEBasicApplicationVersion.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

UpdateFEBasicApplicationVersion.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if(GIT_FOUND)
2121
# Count total commits on master, this is the stable build number.
2222
execute_process(
2323
COMMAND ${GIT_EXECUTABLE} rev-list --count origin/master
24-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
24+
WORKING_DIRECTORY ${FEBASICAPPLICATION_FOLDER}
2525
OUTPUT_VARIABLE FEBASICAPPLICATION_MASTER_COMMIT_COUNT
2626
OUTPUT_STRIP_TRAILING_WHITESPACE
2727
ERROR_QUIET
@@ -31,7 +31,7 @@ if(GIT_FOUND)
3131
# Will be 0 when building on master itself.
3232
execute_process(
3333
COMMAND ${GIT_EXECUTABLE} rev-list --count origin/master..HEAD
34-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
34+
WORKING_DIRECTORY ${FEBASICAPPLICATION_FOLDER}
3535
OUTPUT_VARIABLE FEBASICAPPLICATION_BRANCH_COMMIT_COUNT
3636
OUTPUT_STRIP_TRAILING_WHITESPACE
3737
ERROR_QUIET
@@ -41,7 +41,7 @@ if(GIT_FOUND)
4141
# Short hash for exact commit identification.
4242
execute_process(
4343
COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
44-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
44+
WORKING_DIRECTORY ${FEBASICAPPLICATION_FOLDER}
4545
OUTPUT_VARIABLE FEBASICAPPLICATION_GIT_HASH
4646
OUTPUT_STRIP_TRAILING_WHITESPACE
4747
)
@@ -50,7 +50,7 @@ if(GIT_FOUND)
5050
# Get current branch name. Returns "HEAD" when in detached HEAD state.
5151
execute_process(
5252
COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
53-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
53+
WORKING_DIRECTORY ${FEBASICAPPLICATION_FOLDER}
5454
OUTPUT_VARIABLE FEBASICAPPLICATION_GIT_BRANCH
5555
OUTPUT_STRIP_TRAILING_WHITESPACE
5656
)
@@ -60,7 +60,7 @@ if(GIT_FOUND)
6060
# git diff --quiet returns exit code 1 if there are changes.
6161
execute_process(
6262
COMMAND ${GIT_EXECUTABLE} diff --quiet HEAD
63-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
63+
WORKING_DIRECTORY ${FEBASICAPPLICATION_FOLDER}
6464
RESULT_VARIABLE GIT_DIRTY_RC
6565
)
6666
if(GIT_DIRTY_RC EQUAL 0)
@@ -83,7 +83,7 @@ endif()
8383
if("${FEBASICAPPLICATION_GIT_BRANCH}" STREQUAL "HEAD")
8484
execute_process(
8585
COMMAND ${GIT_EXECUTABLE} branch -r --contains HEAD
86-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
86+
WORKING_DIRECTORY ${FEBASICAPPLICATION_FOLDER}
8787
OUTPUT_VARIABLE FEBASICAPPLICATION_GIT_BRANCH
8888
OUTPUT_STRIP_TRAILING_WHITESPACE
8989
ERROR_QUIET
@@ -102,4 +102,4 @@ endif()
102102
string(TIMESTAMP FEBASICAPPLICATION_BUILD_TIMESTAMP \"%Y%m%d%H%M%S\")
103103
104104
# --- Generate header ---
105-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FEBasicApplicationVersion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/FEBasicApplicationVersion.h @ONLY)
105+
configure_file(${FEBASICAPPLICATION_FOLDER}/FEBasicApplicationVersion.h.in ${FEBASICAPPLICATION_FOLDER}/FEBasicApplicationVersion.h @ONLY)

0 commit comments

Comments
 (0)