Skip to content

Commit 7292a6e

Browse files
cmake: respect value of NEO_DRIVER_VERSION when provided externally
Change-Id: I32913a45739df7e0991119b98118a36afc7a65bb Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
1 parent 9eafa72 commit 7292a6e

File tree

1 file changed

+40
-38
lines changed

1 file changed

+40
-38
lines changed

version.cmake

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,51 @@
1919
# OTHER DEALINGS IN THE SOFTWARE.
2020

2121
if(UNIX)
22-
find_program(GIT NAMES git)
23-
if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND")
24-
if(IS_DIRECTORY ${IGDRCL_SOURCE_DIR}/.git)
25-
set(GIT_arg --git-dir=${IGDRCL_SOURCE_DIR}/.git show -s --format=%ct)
26-
execute_process(
27-
COMMAND ${GIT} ${GIT_arg}
28-
OUTPUT_VARIABLE GIT_output
29-
OUTPUT_STRIP_TRAILING_WHITESPACE
30-
)
22+
if(NOT DEFINED NEO_DRIVER_VERSION)
23+
find_program(GIT NAMES git)
24+
if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND")
25+
if(IS_DIRECTORY ${IGDRCL_SOURCE_DIR}/.git)
26+
set(GIT_arg --git-dir=${IGDRCL_SOURCE_DIR}/.git show -s --format=%ct)
27+
execute_process(
28+
COMMAND ${GIT} ${GIT_arg}
29+
OUTPUT_VARIABLE GIT_output
30+
OUTPUT_STRIP_TRAILING_WHITESPACE
31+
)
32+
endif()
3133
endif()
32-
endif()
3334

34-
if(NOT DEFINED NEO_VERSION_MAJOR)
35-
if(NOT DEFINED GIT_output)
36-
set(NEO_VERSION_MAJOR 1)
37-
else()
38-
SET(DATE_arg --date=@${GIT_output} +%y)
39-
execute_process(
40-
COMMAND date ${DATE_arg}
41-
OUTPUT_VARIABLE NEO_VERSION_MAJOR
42-
OUTPUT_STRIP_TRAILING_WHITESPACE
43-
)
44-
message(STATUS "Computed version major is: ${NEO_VERSION_MAJOR}")
35+
if(NOT DEFINED NEO_VERSION_MAJOR)
36+
if(NOT DEFINED GIT_output)
37+
set(NEO_VERSION_MAJOR 1)
38+
else()
39+
SET(DATE_arg --date=@${GIT_output} +%y)
40+
execute_process(
41+
COMMAND date ${DATE_arg}
42+
OUTPUT_VARIABLE NEO_VERSION_MAJOR
43+
OUTPUT_STRIP_TRAILING_WHITESPACE
44+
)
45+
message(STATUS "Computed version major is: ${NEO_VERSION_MAJOR}")
46+
endif()
4547
endif()
46-
endif()
4748

48-
if(NOT DEFINED NEO_VERSION_MINOR)
49-
if(NOT DEFINED GIT_output)
50-
set(NEO_VERSION_MINOR 0)
51-
else()
52-
SET(DATE_arg --date=@${GIT_output} +%V)
53-
execute_process(
54-
COMMAND date ${DATE_arg}
55-
OUTPUT_VARIABLE NEO_VERSION_MINOR
56-
OUTPUT_STRIP_TRAILING_WHITESPACE
57-
)
58-
message(STATUS "Computed version minor is: ${NEO_VERSION_MINOR}")
49+
if(NOT DEFINED NEO_VERSION_MINOR)
50+
if(NOT DEFINED GIT_output)
51+
set(NEO_VERSION_MINOR 0)
52+
else()
53+
SET(DATE_arg --date=@${GIT_output} +%V)
54+
execute_process(
55+
COMMAND date ${DATE_arg}
56+
OUTPUT_VARIABLE NEO_VERSION_MINOR
57+
OUTPUT_STRIP_TRAILING_WHITESPACE
58+
)
59+
message(STATUS "Computed version minor is: ${NEO_VERSION_MINOR}")
60+
endif()
5961
endif()
60-
endif()
6162

62-
if(NOT DEFINED NEO_VERSION_BUILD)
63-
set(NEO_VERSION_BUILD 0)
63+
if(NOT DEFINED NEO_VERSION_BUILD)
64+
set(NEO_VERSION_BUILD 0)
65+
endif()
66+
set(NEO_DRIVER_VERSION "${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_VERSION_BUILD}")
6467
endif()
6568
else()
6669
if(NOT DEFINED NEO_VERSION_MAJOR)
@@ -74,6 +77,5 @@ else()
7477
if(NOT DEFINED NEO_VERSION_BUILD)
7578
set(NEO_VERSION_BUILD 0)
7679
endif()
80+
set(NEO_DRIVER_VERSION "${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_VERSION_BUILD}")
7781
endif(UNIX)
78-
79-
set(NEO_DRIVER_VERSION "${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_VERSION_BUILD}")

0 commit comments

Comments
 (0)