2096854 · opencog-cogserver

Changed files (5) +60 -73

CMakeLists.txt +8 -26

…	…	@@ -51,21 +51,11 @@ ADD_DEFINITIONS(-DPROJECT_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
51	51	# Listed in alphabetical order, more or less.
52	52	# CogUtil must come first, because it supplies various FindXXX macros.
53	53
54		# Add the 'lib' dir to cmake's module search path
55		list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/lib/")
56
57	54	# Cogutil
58	55	FIND_PACKAGE(CogUtil 2.2.1 CONFIG REQUIRED)
59		IF (COGUTIL_FOUND)
60		MESSAGE(STATUS "CogUtil version ${COGUTIL_VERSION} found.")
61		ADD_DEFINITIONS(-DHAVE_COGUTIL)
62		SET(HAVE_COGUTIL 1)
63		ELSE (COGUTIL_FOUND)
	56	IF (NOT COGUTIL_FOUND)
64	57	MESSAGE(FATAL_ERROR "CogUtil missing: it is needed!")
65		ENDIF (COGUTIL_FOUND)
66
67		# add the 'cmake' directory from cogutil to search path
68		list(APPEND CMAKE_MODULE_PATH ${COGUTIL_DATA_DIR}/cmake)
	58	ENDIF ()
69	59
70	60	include(${COGUTIL_DATA_DIR}/cmake/OpenCogGccOptions.cmake)
71	61	include(${COGUTIL_DATA_DIR}/cmake/OpenCogLibOptions.cmake)
…	…	@@ -77,23 +67,15 @@ include(${COGUTIL_DATA_DIR}/cmake/Summary.cmake)
77	67
78	68	# AtomSpace
79	69	FIND_PACKAGE(AtomSpace 5.2.0 CONFIG REQUIRED)
80		IF (ATOMSPACE_FOUND)
81		MESSAGE(STATUS "AtomSpace version ${ATOMSPACE_VERSION} found.")
82		ADD_DEFINITIONS(-DHAVE_ATOMSPACE)
83		SET(HAVE_ATOMSPACE 1)
84		ELSE (ATOMSPACE_FOUND)
	70	IF (NOT ATOMSPACE_FOUND)
85	71	MESSAGE(FATAL_ERROR "AtomSpace missing: it is needed!")
86		ENDIF (ATOMSPACE_FOUND)
	72	ENDIF ()
87	73
88	74	# AtomSpace Storage proves s-expression parsing
89	75	FIND_PACKAGE(AtomSpaceStorage 4.3.0 CONFIG REQUIRED)
90		IF (ATOMSPACE_STORAGE_FOUND)
91		MESSAGE(STATUS "AtomSpace Storage version ${ATOMSPACE_STORAGE_VERSION} found.")
92		ADD_DEFINITIONS(-DHAVE_ATOMSPACE_STORAGE)
93		SET(HAVE_ATOMSPACE_STORAGE 1)
94		ELSE (ATOMSPACE_STORAGE_FOUND)
	76	IF (NOT ATOMSPACE_STORAGE_FOUND)
95	77	MESSAGE(FATAL_ERROR "AtomSpace Storage missing: it is needed!")
96		ENDIF (ATOMSPACE_STORAGE_FOUND)
	78	ENDIF ()
97	79
98	80	FIND_PACKAGE(Asio REQUIRED)
99	81	IF (Asio_FOUND)
…	…	@@ -173,7 +155,7 @@ IF(HAVE_ATOMSPACE AND HAVE_COGUTIL)
173	155	ENDIF(HAVE_ATOMSPACE AND HAVE_COGUTIL)
174	156
175	157	IF(HAVE_SERVER)
176		ADD_SUBDIRECTORY(lib)
	158	ADD_SUBDIRECTORY(cmake)
177	159	ADD_SUBDIRECTORY(opencog)
178	160	# ADD_SUBDIRECTORY(examples EXCLUDE_FROM_ALL)
179	161	ADD_SUBDIRECTORY(examples)
…	…	@@ -260,7 +242,7 @@ SET(CPACK_PACKAGE_EXECUTABLES "cogserver" "The OpenCog Network Server")
260	242
261	243	## Debian specific configurations
262	244	SET(DEPENDENCY_LIST
263		"guile-2.2-dev (>= 2.2.2)"
	245	"guile-3.0-dev (>= 3.0.0)"
264	246	"python3-dev (>= 3.6.7)"
265	247	"libstdc++6 (>= 4.7)"
266	248	"libcogutil-dev (>= 2.2.1)"

cmake/CMakeLists.txt +27 -0

…	…	@@ -0,0 +1,27 @@
	1
	2	include(CMakePackageConfigHelpers)
	3
	4	set(ConfigPackageLocation lib/cmake/CogServer)
	5
	6	install(EXPORT CogServerTargets
	7	FILE CogServerTargets.cmake
	8	DESTINATION ${ConfigPackageLocation}
	9	)
	10
	11	configure_package_config_file(CogServerConfig.cmake.in
	12	${CMAKE_CURRENT_BINARY_DIR}/CogServerConfig.cmake
	13	INSTALL_DESTINATION ${ConfigPackageLocation}
	14	PATH_VARS CMAKE_INSTALL_PREFIX
	15	)
	16
	17	write_basic_package_version_file(
	18	"${CMAKE_CURRENT_BINARY_DIR}/CogServerConfigVersion.cmake"
	19	VERSION ${PROJECT_VERSION}
	20	COMPATIBILITY SameMajorVersion
	21	)
	22
	23	INSTALL(FILES
	24	${CMAKE_CURRENT_BINARY_DIR}/CogServerConfigVersion.cmake
	25	${CMAKE_CURRENT_BINARY_DIR}/CogServerConfig.cmake
	26	DESTINATION ${ConfigPackageLocation}
	27	)

cmake/CogServerConfig.cmake.in +25 -0

…	…	@@ -0,0 +1,25 @@
	1	@PACKAGE_INIT@
	2
	3	include("@CMAKE_INSTALL_PREFIX@/lib/cmake/CogServer/CogServerTargets.cmake")
	4
	5	# libscheme-shell.so is in the modules directory
	6	link_directories(
	7	"@CMAKE_INSTALL_PREFIX@/lib@LIB_DIR_SUFFIX@/opencog/"
	8	"@CMAKE_INSTALL_PREFIX@/lib@LIB_DIR_SUFFIX@/opencog/modules"
	9	)
	10	set(COGSERVER_LIBRARIES
	11	network
	12	server
	13	servernode
	14	cogserver-types
	15	)
	16
	17	set(COGSERVER_DATA_DIR "@CMAKE_INSTALL_PREFIX@/share/opencog")
	18	set(COGSERVER_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/")
	19	set(COGSERVER_VERSION "@PROJECT_VERSION@")
	20	set(COGSERVER_FOUND 1)
	21
	22	MESSAGE(STATUS "CogServer version ${COGSERVER_VERSION} found.")
	23
	24	# Automatically add cogservers cmake modules to the module path
	25	list(APPEND CMAKE_MODULE_PATH "${COGUTIL_DATA_DIR}/cmake")

lib/CMakeLists.txt +0 -27

…	…	@@ -1,27 +0,0 @@
1
2		include(CMakePackageConfigHelpers)
3
4		set(ConfigPackageLocation lib/cmake/CogServer)
5
6		install(EXPORT CogServerTargets
7		FILE CogServerTargets.cmake
8		DESTINATION ${ConfigPackageLocation}
9		)
10
11		configure_package_config_file(CogServerConfig.cmake.in
12		${CMAKE_CURRENT_BINARY_DIR}/CogServerConfig.cmake
13		INSTALL_DESTINATION ${ConfigPackageLocation}
14		PATH_VARS CMAKE_INSTALL_PREFIX
15		)
16
17		write_basic_package_version_file(
18		"${CMAKE_CURRENT_BINARY_DIR}/CogServerConfigVersion.cmake"
19		VERSION ${PROJECT_VERSION}
20		COMPATIBILITY SameMajorVersion
21		)
22
23		INSTALL(FILES
24		${CMAKE_CURRENT_BINARY_DIR}/CogServerConfigVersion.cmake
25		${CMAKE_CURRENT_BINARY_DIR}/CogServerConfig.cmake
26		DESTINATION ${ConfigPackageLocation}
27		)

lib/CogServerConfig.cmake.in +0 -20

…	…	@@ -1,20 +0,0 @@
1		@PACKAGE_INIT@
2
3		include("@CMAKE_INSTALL_PREFIX@/lib/cmake/CogServer/CogServerTargets.cmake")
4
5		# libscheme-shell.so is in the modules directory
6		link_directories(
7		"@CMAKE_INSTALL_PREFIX@/lib@LIB_DIR_SUFFIX@/opencog/"
8		"@CMAKE_INSTALL_PREFIX@/lib@LIB_DIR_SUFFIX@/opencog/modules"
9		)
10		set(COGSERVER_LIBRARIES
11		network
12		server
13		servernode
14		cogserver-types
15		)
16
17		set(COGSERVER_DATA_DIR "@CMAKE_INSTALL_PREFIX@/share/opencog")
18		set(COGSERVER_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/")
19		set(COGSERVER_VERSION "@PROJECT_VERSION@")
20		set(COGSERVER_FOUND 1)

opencog-cogserver commits / 2096854

Changed files (5) +60 -73