OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-atomspace-cog commits / 3f04bbe

Clean up old cruft in CMakefile
3f04bbe25f380346e37c778f82ef466a164c5444
by Linas Vepštas <linasvepstas@gmail.com> · 2025-12-16T23:38:46.000Z

Changed files (1) +10 -30

CMakeLists.txt +10 -30
……@@ -21,7 +21,7 @@ IF(CMAKE_VERSION VERSION_GREATER 3.31)
2121 CMAKE_POLICY(SET CMP0177 NEW)
2222ENDIF(CMAKE_VERSION VERSION_GREATER 3.31)
2323
24PROJECT(cogclient VERSION 1.2.0)
24PROJECT(cog-storage VERSION 1.2.0)
2525
2626# ----------------------------------------------------------
2727# User-modifiable options. Feel free to change these!
……@@ -56,21 +56,10 @@ ADD_DEFINITIONS(-DPROJECT_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
5656# Listed in alphabetical order, more or less.
5757# CogUtil must come first, because it supplies various FindXXX macros.
5858
59# Add the 'lib' dir to cmake's module search path
60list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/lib/")
61
6259# Cogutil
6360FIND_PACKAGE(CogUtil 2.2.1 CONFIG REQUIRED)
64IF (COGUTIL_FOUND)
65 MESSAGE(STATUS "CogUtil found.")
66 ADD_DEFINITIONS(-DHAVE_COGUTIL)
67 SET(HAVE_COGUTIL 1)
68ELSE (COGUTIL_FOUND)
69 MESSAGE(FATAL_ERROR "CogUtil missing: it is needed!")
70ENDIF (COGUTIL_FOUND)
71
72# add the 'cmake' directory from cogutil to search path
73list(APPEND CMAKE_MODULE_PATH ${COGUTIL_DATA_DIR}/cmake)
61IF (NOT COGUTIL_FOUND)
62ENDIF ()
7463
7564include(${COGUTIL_DATA_DIR}/cmake/OpenCogGccOptions.cmake)
7665include(${COGUTIL_DATA_DIR}/cmake/OpenCogLibOptions.cmake)
……@@ -82,27 +71,18 @@ include(${COGUTIL_DATA_DIR}/cmake/Summary.cmake)
8271
8372# AtomSpace
8473FIND_PACKAGE(AtomSpace 5.2.0 CONFIG REQUIRED)
85IF (ATOMSPACE_FOUND)
86 MESSAGE(STATUS "AtomSpace found.")
87 ADD_DEFINITIONS(-DHAVE_ATOMSPACE)
88 SET(HAVE_ATOMSPACE 1)
89ELSE (ATOMSPACE_FOUND)
74IF (NOT ATOMSPACE_FOUND)
9075 MESSAGE(FATAL_ERROR "AtomSpace missing: it is needed!")
91ENDIF (ATOMSPACE_FOUND)
76ENDIF ()
9277
9378FIND_PACKAGE(AtomSpaceStorage 4.3 CONFIG REQUIRED)
94IF (ATOMSPACE_STORAGE_FOUND)
95 MESSAGE(STATUS "AtomSpace Storage found.")
96 ADD_DEFINITIONS(-DHAVE_ATOMSPACE_STORAGE)
97 SET(HAVE_ATOMSPACE_STORAGE 1)
98ELSE (ATOMSPACE_STORAGE_FOUND)
79IF (NOT ATOMSPACE_STORAGE_FOUND)
9980 MESSAGE(FATAL_ERROR "AtomSpace Storage missing: it is needed!")
100ENDIF (ATOMSPACE_STORAGE_FOUND)
81ENDIF ()
10182
10283# CogServer - needed for unit tests
10384FIND_PACKAGE(CogServer 3.4 CONFIG REQUIRED)
10485IF (COGSERVER_FOUND)
105 MESSAGE(STATUS "CogServer found.")
10686 SET(HAVE_COGSERVER 1)
10787ELSE (COGSERVER_FOUND)
10888 MESSAGE(STATUS "CogServer missing: needed for unit tests.")
……@@ -231,8 +211,8 @@ SET(CPACK_PACKAGE_EXECUTABLES "atomspace-cog" "The AtomSpace Cogserver Client")
231211SET(DEPENDENCY_LIST
232212 "guile-3.0-dev (>= 3.0.0)"
233213 "libstdc++6 (>= 4.7)"
234 "libcogutil-dev (>= 2.0.2)"
235 "atomspace-dev (>= 5.0.3)"
214 "libcogutil-dev (>= 2.2.1)"
215 "atomspace-dev (>= 5.2.0)"
236216)
237217
238218STRING(REPLACE ";" ", " MAIN_DEPENDENCIES "${DEPENDENCY_LIST}")
……@@ -249,7 +229,7 @@ FIND_PACKAGE(Doxygen)
249229# ===================================================================
250230# Show a summary of what we found, what we will do.
251231
252SUMMARY_ADD("AtomSpace-Cog" "AtomSpace CogServer Network Client" HAVE_ATOMSPACE)
232SUMMARY_ADD("CogStorage" "Network Distributed AtomSpace" 1)
253233SUMMARY_ADD("Doxygen" "Code documentation" DOXYGEN_FOUND)
254234SUMMARY_ADD("Unit tests" "Unit tests" CXXTEST_FOUND AND HAVE_COGSERVER)
255235