Skip to content

Commit 6dacd8a

Browse files
committed
fix VERSION on windows
1 parent 301a569 commit 6dacd8a

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

CMakeLists.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.31.6)
33
set(CMAKE_CXX_STANDARD 20)
44
set(CMAKE_CXX_STANDARD_REQUIRED ON)
55
set(CMAKE_CXX_EXTENSIONS OFF)
6-
set(DIR_SRC src/cpp)
7-
set(DIR_SRC_COMMON src/cpp/fs)
6+
set(DIR_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/cpp)
7+
set(DIR_SRC_COMMON ${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/fs)
8+
set(FILE_ENV ${CMAKE_CURRENT_SOURCE_DIR}/.env)
89

910
if(NOT VCPKG_ROOT)
1011
set(VCPKG_ROOT $ENV{VCPKG_ROOT})
@@ -119,9 +120,9 @@ endif()
119120
message("CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
120121

121122
# HACK: look for version in parent folder .env
122-
if(EXISTS ".env")
123-
execute_process(COMMAND git log -n1 --pretty=%h .env OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE HASH_ENV)
124-
file(STRINGS ".env" CONFIG REGEX "^[ ]*[A-Za-z0-9_]+[ ]*=")
123+
if(EXISTS "${FILE_ENV}")
124+
execute_process(COMMAND git log -n1 --pretty=%h ${FILE_ENV} OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE HASH_ENV)
125+
file(STRINGS "${FILE_ENV}" CONFIG REGEX "^[ ]*[A-Za-z0-9_]+[ ]*=")
125126
list(TRANSFORM CONFIG STRIP)
126127
list(TRANSFORM CONFIG REPLACE "([^=]+)=[ ]*(.*)" "set(\\1 \"\\2\")\n")
127128
message(${CONFIG})
@@ -149,7 +150,7 @@ execute_process(COMMAND ${CMAKE_CXX_COMPILER})
149150
file(GLOB_RECURSE FILES_USED ${DIR_SRC}/*.cpp ${DIR_SRC}/*.h)
150151
list(FILTER FILES_USED EXCLUDE REGEX version*)
151152

152-
set(FILE_VERSION_CPP ${DIR_SRC_COMMON}/version.cpp)
153+
set(FILE_VERSION_H ${DIR_SRC_COMMON}/version.h)
153154
set(FILE_UNSTABLE_CPP ${DIR_SRC_COMMON}/unstable.cpp)
154155

155156
# is anything in git changed?
@@ -185,15 +186,15 @@ endif()
185186

186187
set (SPECIFIC_REVISION "v${VERSION} ${HASH} <${MODIFIED_TIME}>")
187188
message("${SPECIFIC_REVISION}")
188-
set(VERSION_CODE "const char* SPECIFIC_REVISION = \"${SPECIFIC_REVISION}\";\n")
189-
if(EXISTS FILE_VERSION_CPP)
190-
file(STRINGS ${FILE_VERSION_CPP} VERSION_CODE_OLD)
189+
set(VERSION_CODE "constexpr char SPECIFIC_REVISION[]{\"${SPECIFIC_REVISION}\"};\n")
190+
if(EXISTS FILE_VERSION_H)
191+
file(STRINGS ${FILE_VERSION_H} VERSION_CODE_OLD)
191192
# HACK: file(READ ...) is reacting to special characters, so compare substring
192193
string(FIND "${SPECIFIC_REVISION}" "${VERSION_CODE_OLD}" SAME_CODE)
193194
endif()
194195
# if matched exiting file don't write
195196
if (NOT 0 EQUAL SAME_CODE)
196-
file(WRITE ${FILE_VERSION_CPP} "${VERSION_CODE}")
197+
file(WRITE ${FILE_VERSION_H} "${VERSION_CODE}")
197198
endif()
198199

199200
set_source_files_properties(${FILE_UNSTABLE_CPP} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")

src/cpp/firestarr.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ using fs::Wind;
4343
using fs::logging::Log;
4444
int main(const int argc, const char* const argv[])
4545
{
46-
#ifdef _WIN32
47-
printf("FireSTARR windows-testing\n\n");
48-
#else
4946
printf("FireSTARR %s\n\n", SPECIFIC_REVISION);
50-
#endif
5147
MainArgumentParser parser{argc, argv};
5248
parser.parse_args();
5349
auto result = -1;

src/cpp/fs/version.h

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

0 commit comments

Comments
 (0)