Skip to content

Commit 86db9b1

Browse files
committed
Fix build-info on MSVC.
1 parent bc9d3e3 commit 86db9b1

File tree

2 files changed

+19
-34
lines changed

2 files changed

+19
-34
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
118118
add_custom_command(
119119
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/build-info.h"
120120
COMMENT "Generating build details from Git"
121-
COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_SOURCE_DIR}/scripts/build-info.cmake"
121+
COMMAND ${CMAKE_COMMAND} -DMSVC=${MSVC} -DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION} -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} -DCMAKE_VS_PLATFORM_NAME=${CMAKE_VS_PLATFORM_NAME} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -P "${CMAKE_CURRENT_SOURCE_DIR}/scripts/build-info.cmake"
122122
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
123123
DEPENDS "${GIT_DIR}/index"
124124
VERBATIM

scripts/build-info.cmake

+18-33
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ set(BUILD_TARGET "unknown")
88
# Look for git
99
find_package(Git)
1010
if(NOT Git_FOUND)
11-
execute_process(
12-
COMMAND which git
13-
OUTPUT_VARIABLE GIT_EXECUTABLE
14-
OUTPUT_STRIP_TRAILING_WHITESPACE
15-
)
16-
if(NOT GIT_EXECUTABLE STREQUAL "")
11+
find_program(GIT_EXECUTABLE NAMES git git.exe)
12+
if(GIT_EXECUTABLE)
1713
set(Git_FOUND TRUE)
18-
message(STATUS "Found Git using 'which': ${GIT_EXECUTABLE}")
14+
message(STATUS "Found Git: ${GIT_EXECUTABLE}")
1915
else()
20-
message(WARNING "Git not found using 'find_package' or 'which'. Build info will not be accurate. Consider installing Git or ensuring it is in the PATH.")
16+
message(WARNING "Git not found. Build info will not be accurate.")
2117
endif()
2218
endif()
2319

@@ -28,43 +24,32 @@ if(Git_FOUND)
2824
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
2925
OUTPUT_VARIABLE HEAD
3026
OUTPUT_STRIP_TRAILING_WHITESPACE
31-
RESULT_VARIABLE GIT_HEAD_RESULT
3227
)
3328
execute_process(
3429
COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD
3530
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
3631
OUTPUT_VARIABLE COUNT
3732
OUTPUT_STRIP_TRAILING_WHITESPACE
38-
RESULT_VARIABLE GIT_COUNT_RESULT
3933
)
40-
if(GIT_HEAD_RESULT EQUAL 0 AND GIT_COUNT_RESULT EQUAL 0)
41-
set(BUILD_COMMIT ${HEAD})
42-
set(BUILD_NUMBER ${COUNT})
43-
endif()
44-
endif()
45-
46-
if(GIT_HEAD_RESULT EQUAL 0 AND GIT_COUNT_RESULT EQUAL 0)
4734
set(BUILD_COMMIT ${HEAD})
4835
set(BUILD_NUMBER ${COUNT})
4936
endif()
5037

51-
execute_process(
52-
COMMAND sh -c "$@ --version | head -1" _ ${CMAKE_C_COMPILER}
53-
OUTPUT_VARIABLE OUT
54-
OUTPUT_STRIP_TRAILING_WHITESPACE
55-
RESULT_VARIABLE RES
56-
)
57-
if (RES EQUAL 0)
38+
if(MSVC)
39+
set(BUILD_COMPILER "${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}")
40+
set(BUILD_TARGET ${CMAKE_VS_PLATFORM_NAME})
41+
else()
42+
execute_process(
43+
COMMAND sh -c "$@ --version | head -1" _ ${CMAKE_C_COMPILER}
44+
OUTPUT_VARIABLE OUT
45+
OUTPUT_STRIP_TRAILING_WHITESPACE
46+
)
5847
set(BUILD_COMPILER ${OUT})
59-
endif()
60-
61-
execute_process(
62-
COMMAND ${CMAKE_C_COMPILER} -dumpmachine
63-
OUTPUT_VARIABLE OUT
64-
OUTPUT_STRIP_TRAILING_WHITESPACE
65-
RESULT_VARIABLE RES
66-
)
67-
if (RES EQUAL 0)
48+
execute_process(
49+
COMMAND ${CMAKE_C_COMPILER} -dumpmachine
50+
OUTPUT_VARIABLE OUT
51+
OUTPUT_STRIP_TRAILING_WHITESPACE
52+
)
6853
set(BUILD_TARGET ${OUT})
6954
endif()
7055

0 commit comments

Comments
 (0)