OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-atomspace-rocks commits / 4b85338

Revise versioning system
PROJECT_VERSION seems to be standard
4b85338ea0f89a20cceb215dfa308ff66e589e0b
by Linas Vepštas <linasvepstas@gmail.com> · 2025-12-16T01:12:51.000Z

Changed files (3) +10 -17

CMakeLists.txt +7 -12
……@@ -23,7 +23,7 @@ IF(CMAKE_VERSION VERSION_GREATER 3.31)
2323 CMAKE_POLICY(SET CMP0177 NEW)
2424ENDIF(CMAKE_VERSION VERSION_GREATER 3.31)
2525
26PROJECT(atomspace-rocks)
26PROJECT(atomspace-rocks VERSION 1.6.0)
2727
2828# ----------------------------------------------------------
2929# User-modifiable options. Feel free to change these!
……@@ -62,7 +62,7 @@ ADD_DEFINITIONS(-DPROJECT_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
6262list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/lib/")
6363
6464# Cogutil
65FIND_PACKAGE(CogUtil 2.0.1 CONFIG REQUIRED)
65FIND_PACKAGE(CogUtil 2.2.1 CONFIG REQUIRED)
6666IF (COGUTIL_FOUND)
6767 MESSAGE(STATUS "CogUtil version ${COGUTIL_VERSION} found.")
6868 ADD_DEFINITIONS(-DHAVE_COGUTIL)
……@@ -83,7 +83,7 @@ include(Summary)
8383# Check for existence of various required, optional packages.
8484
8585# AtomSpace
86FIND_PACKAGE(AtomSpace 5.0.3 CONFIG REQUIRED)
86FIND_PACKAGE(AtomSpace 5.2.0 CONFIG REQUIRED)
8787IF (ATOMSPACE_FOUND)
8888 MESSAGE(STATUS "AtomSpace found.")
8989 ADD_DEFINITIONS(-DHAVE_ATOMSPACE)
……@@ -92,7 +92,7 @@ ELSE (ATOMSPACE_FOUND)
9292 MESSAGE(FATAL_ERROR "AtomSpace missing: it is needed!")
9393ENDIF (ATOMSPACE_FOUND)
9494
95FIND_PACKAGE(AtomSpaceStorage 4.1 CONFIG REQUIRED)
95FIND_PACKAGE(AtomSpaceStorage 4.3 CONFIG REQUIRED)
9696IF (ATOMSPACE_STORAGE_FOUND)
9797 MESSAGE(STATUS "AtomSpace Storage found.")
9898 ADD_DEFINITIONS(-DHAVE_ATOMSPACE_STORAGE)
……@@ -223,11 +223,6 @@ STRING(TIMESTAMP UTC_DATE %Y%m%d UTC)
223223# that it is owned by the builder thus avoiding 'Permission denied' error when
224224# packaging.
225225FILE(WRITE "${PROJECT_BINARY_DIR}/install_manifest.txt")
226## It doesn't have a header-file declaring the version similar to cogutil and
227## atomspace.
228# SEMANTIC_VERSION is set in `cmake/CMakeLists.txt`
229# and passes through `cmake/AtomSpaceRocksConfig.cmake.in`
230# SET(SEMANTIC_VERSION 1.5.3)
231226
232227## Cpack configuration
233228SET(CPACK_GENERATOR "DEB")
……@@ -237,7 +232,7 @@ SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages")
237232SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The AtomSpace RocksDB Storage Backend")
238233SET(CPACK_PACKAGE_NAME "atomspace-rocks-dev")
239234SET(CPACK_PACKAGE_VENDOR "opencog.org")
240SET(CPACK_PACKAGE_VERSION "${SEMANTIC_VERSION}-${UTC_DATE}")
235SET(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}-${UTC_DATE}")
241236SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
242237SET(CPACK_PACKAGE_FILE_NAME
243238 "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${PACKAGE_ARCHITECTURE}")
……@@ -247,8 +242,8 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
247242SET(DEPENDENCY_LIST
248243 "guile-3.0-dev (>= 3.0.0)"
249244 "libstdc++6 (>= 7.0)"
250 "libcogutil-dev (>= 2.0.2)"
251 "atomspace-dev (>= 5.0.3)"
245 "libcogutil-dev (>= 2.2.1)"
246 "atomspace-dev (>= 5.2.0)"
252247)
253248
254249STRING(REPLACE ";" ", " MAIN_DEPENDENCIES "${DEPENDENCY_LIST}")
cmake/AtomSpaceRocksConfig.cmake.in +1 -1
……@@ -12,5 +12,5 @@ set(ATOMSPACE_ROCKS_LIBRARIES
1212
1313set(ATOMSPACE_ROCKS_DATA_DIR "@CMAKE_INSTALL_PREFIX@/share/opencog")
1414set(ATOMSPACE_ROCKS_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/")
15set(ATOMSPACE_ROCKS_VERSION "@SEMANTIC_VERSION@")
15set(ATOMSPACE_ROCKS_VERSION "@PROJECT_VERSION@")
1616set(ATOMSPACE_ROCKS_FOUND 1)
cmake/CMakeLists.txt +2 -4
……@@ -1,6 +1,6 @@
11
22# CMake boilerplate that allows users to do
3# find_package(AtomspaceRocks REQUIRED 1.5.3)
3# find_package(AtomspaceRocks REQUIRED 1.6.0)
44# and have it work.
55
66include(CMakePackageConfigHelpers)
……@@ -12,8 +12,6 @@ install(EXPORT AtomSpaceRocksTargets
1212 DESTINATION ${ConfigPackageLocation}
1313)
1414
15SET(SEMANTIC_VERSION 1.6.0)
16
1715configure_package_config_file(AtomSpaceRocksConfig.cmake.in
1816 ${CMAKE_CURRENT_BINARY_DIR}/AtomSpaceRocksConfig.cmake
1917 INSTALL_DESTINATION ${ConfigPackageLocation}
……@@ -22,7 +20,7 @@ configure_package_config_file(AtomSpaceRocksConfig.cmake.in
2220
2321write_basic_package_version_file(
2422 "${CMAKE_CURRENT_BINARY_DIR}/AtomSpaceRocksConfigVersion.cmake"
25 VERSION ${SEMANTIC_VERSION}
23 VERSION ${PROJECT_VERSION}
2624 COMPATIBILITY SameMajorVersion
2725)
2826