Skip to content

Commit 84fa99d

Browse files
committed
Drop VersionFromGit.cmake module for hardcoded version
In case where the library is downloaded as a tarball (eg. Buildroot), the VersionFromGit module would fail resulting in the library not building. Since there aren't any immidiate fixes, I've hardcoded the VERSION in the CMake project(). Signed-off-by: Andrea Ricchi <andrea.ricchi@amarulasolutions.com>
1 parent d89262c commit 84fa99d

File tree

2 files changed

+2
-174
lines changed

2 files changed

+2
-174
lines changed

CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ option(BUILD_EXAMPLES "Build Examples" OFF)
44
option(BUILD_TESTS "Build Tests" OFF)
55
option(BUILD_CONNMAN "Build Connman Proxy" OFF)
66

7-
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/VersionFromGit.cmake)
8-
version_from_git(LOG OFF TIMESTAMP "%Y%m%d%H%M%S")
9-
107
project(
118
GDbusCpp
12-
VERSION ${VERSION}
9+
VERSION 1.0.0
1310
DESCRIPTION ""
1411
LANGUAGES C CXX)
1512

@@ -105,7 +102,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
105102
endif(DOXYGEN_FOUND)
106103
endif(BUILD_DOCS)
107104
set(cpack_file_name
108-
"${PROJECT_NAME}-v${SEMVER}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_VERSION}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_CXX_COMPILER_ID}"
105+
"${PROJECT_NAME}-v${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_VERSION}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_CXX_COMPILER_ID}"
109106
)
110107
set(CPACK_PACKAGE_FILE_NAME ${cpack_file_name})
111108
include(CPack)

cmake/VersionFromGit.cmake

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

0 commit comments

Comments
 (0)