| … | … | @@ -18,7 +18,7 @@ include(cmake/Summary.cmake) |
| 18 | 18 | # add_compile_definitions shows up in CMake version 3.12 |
| 19 | 19 | CMAKE_MINIMUM_REQUIRED(VERSION 3.12) |
| 20 | 20 | |
| 21 | PROJECT(cogutil) | |
| 21 | PROJECT(cogutil VERSION 2.2.1) | |
| 22 | 22 | |
| 23 | 23 | # Uncomment to be in Release mode [default]. |
| 24 | 24 | # SET(CMAKE_BUILD_TYPE Release) |
| … | … | @@ -48,16 +48,6 @@ ADD_DEFINITIONS(-DPROJECT_SOURCE_DIR="${CMAKE_SOURCE_DIR}" |
| 48 | 48 | # Add the 'cmake' dir to cmake's module search path. |
| 49 | 49 | SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") |
| 50 | 50 | |
| 51 | # Get cogutil version. | |
| 52 | # NOTE: This is the official semantic-version, as it is derived from | |
| 53 | # a version-control independent means of declaring versioning. | |
| 54 | # | |
| 55 | FILE(READ "${CMAKE_SOURCE_DIR}/opencog/util/cogutil.h" _CU_H_CONTENTS) | |
| 56 | STRING(REGEX MATCH | |
| 57 | "#define COGUTIL_VERSION_STRING \"([0-9]+[.0-9]+[.0-9]+)\"" | |
| 58 | _ "${_CU_H_CONTENTS}") | |
| 59 | SET(SEMANTIC_VERSION ${CMAKE_MATCH_1}) | |
| 60 | ||
| 61 | 51 | include(cmake/OpenCogGccOptions.cmake) |
| 62 | 52 | |
| 63 | 53 | # ------------------------------------------------------ |
| … | … | @@ -271,7 +261,7 @@ SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages") |
| 271 | 261 | SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The OpenCog Basic C++ Utilities") |
| 272 | 262 | SET(CPACK_PACKAGE_NAME "libcogutil-dev") |
| 273 | 263 | SET(CPACK_PACKAGE_VENDOR "opencog.org") |
| 274 | SET(CPACK_PACKAGE_VERSION "${SEMANTIC_VERSION}-${UTC_DATE}") | |
| 264 | SET(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}-${UTC_DATE}") | |
| 275 | 265 | SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") |
| 276 | 266 | SET(CPACK_PACKAGE_FILE_NAME |
| 277 | 267 | "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${PACKAGE_ARCHITECTURE}") |
| … | … | @@ -7,6 +7,6 @@ libdir=${exec_prefix}/lib/opencog |
| 7 | 7 | |
| 8 | 8 | Name: CogUtil |
| 9 | 9 | Description: The OpenCog Development Utilities Collection |
| 10 | Version: @SEMANTIC_VERSION@ | |
| 10 | Version: @PROJECT_VERSION@ | |
| 11 | 11 | Cflags: -I${includedir} |
| 12 | 12 | Libs: -L${libdir} -lcogutil |
| … | … | @@ -97,7 +97,6 @@ INSTALL(FILES |
| 97 | 97 | async_buffer.h |
| 98 | 98 | async_method_caller.h |
| 99 | 99 | backtrace-symbols.h |
| 100 | cogutil.h | |
| 101 | 100 | Counter.h |
| 102 | 101 | concurrent_queue.h |
| 103 | 102 | concurrent_set.h |
| … | … | @@ -1,33 +0,0 @@ |
| 1 | /* | |
| 2 | * opencog/util/cogutil.h | |
| 3 | * | |
| 4 | * Copyright (C) 2015 by OpenCog Foundation | |
| 5 | * All Rights Reserved | |
| 6 | * | |
| 7 | * This program is free software; you can redistribute it and/or modify | |
| 8 | * it under the terms of the GNU Affero General Public License v3 as | |
| 9 | * published by the Free Software Foundation and including the exceptions | |
| 10 | * at http://opencog.org/wiki/Licenses | |
| 11 | * | |
| 12 | * This program is distributed in the hope that it will be useful, | |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 | * GNU General Public License for more details. | |
| 16 | * | |
| 17 | * You should have received a copy of the GNU Affero General Public License | |
| 18 | * along with this program; if not, write to: | |
| 19 | * Free Software Foundation, Inc., | |
| 20 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 21 | */ | |
| 22 | ||
| 23 | #ifndef _OPENCOG_COGUTIL_H | |
| 24 | #define _OPENCOG_COGUTIL_H | |
| 25 | ||
| 26 | #define COGUTIL_MAJOR_VERSION 2 | |
| 27 | #define COGUTIL_MINOR_VERSION 2 | |
| 28 | #define COGUTIL_MICRO_VERSION 0 | |
| 29 | ||
| 30 | #define COGUTIL_VERSION_STRING "2.2.0" | |
| 31 | ||
| 32 | ||
| 33 | #endif // _OPENCOG_COGUTIL_H |