Skip to content

Commit f0a49f5

Browse files
committed
SWPROT-8953: Hotfixing packages version
It looks like there is a missalignment between unify and cmake conventions. This should be simplified soon or later. Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
1 parent c061a57 commit f0a49f5

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ project(z-wave-protocol-controller)
55
# Include Configurations
66
# ##############################################################################
77

8+
include(cmake/include/version_file.cmake)
9+
include(${CMAKE_BINARY_DIR}/cmake/release-version.cmake)
810
include(cmake/include/version.cmake)
911
include(cmake/include/build_permutations.cmake)
1012

@@ -13,6 +15,12 @@ if(NOT DEFINED COMMON_LOCATION)
1315
set(COMMON_LOCATION "${unifysdk_SOURCE_DIR}")
1416
endif()
1517

18+
message(DEBUG "HotFixing CMAKE_PROJECT_VERSION=${CMAKE_PROJECT_VERSION} from unify")
19+
set(CMAKE_PROJECT_VERSION_PATCH ${VERSION_REV})
20+
set(CMAKE_PROJECT_VERSION_TWEAK ${VERSION_PATCH})
21+
set(CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}${CMAKE_PROJECT_VERSION_TWEAK})
22+
message(DEBUG "HotFixed CMAKE_PROJECT_VERSION=${CMAKE_PROJECT_VERSION} for zpc")
23+
1624
if(BUILD_TESTING)
1725
# https://gitlab.kitware.com/cmake/cmake/-/issues/22813#note_1620373
1826
option(BUILD_TESTING_PROPERTY_DISABLED "WARNING: Bypass some tests" True)
@@ -47,7 +55,6 @@ add_custom_target(unify-binary-dir
4755
)
4856

4957
include(cmake/include/package.cmake)
50-
include(cmake/include/version_file.cmake)
5158

5259
if(BUILD_IMAGE_PROVIDER)
5360
# message(STATUS "Force to build uic-i-p package in zpc project (until it is built in core)")

0 commit comments

Comments
 (0)