f670629 · opencog-matrix

Changed files (3) +11 -11

cmake/AsMatrixConfig.cmake.in +1 -1

…	…	@@ -1,6 +1,6 @@
1	1	@PACKAGE_INIT@
2	2
3		include("@CMAKE_INSTALL_PREFIX@/lib/cmake/AsMatrix/AsMatrixTargets.cmake")
	3	# include("@CMAKE_INSTALL_PREFIX@/lib/cmake/AsMatrix/AsMatrixTargets.cmake")
4	4
5	5	link_directories(
6	6	"@CMAKE_INSTALL_PREFIX@/lib/opencog/"

cmake/CMakeLists.txt +5 -5

…	…	@@ -1,16 +1,16 @@
1	1
2	2	# CMake boilerplate that allows users to do
3		# find_package(AtomspaceRocks REQUIRED 1.3.0)
	3	# find_package(AsMatrix REQUIRED 2.0.0)
4	4	# and have it work.
5	5
6	6	include(CMakePackageConfigHelpers)
7	7
8	8	set(ConfigPackageLocation lib/cmake/AsMatrix)
9	9
10		install(EXPORT AsMatrixTargets
11		FILE AsMatrixTargets.cmake
12		DESTINATION ${ConfigPackageLocation}
13		)
	10	#install(EXPORT AsMatrixTargets
	11	# FILE AsMatrixTargets.cmake
	12	# DESTINATION ${ConfigPackageLocation}
	13	#)
14	14
15	15	SET(SEMANTIC_VERSION 2.0.0)
16	16

opencog/CMakeLists.txt +5 -5

…	…	@@ -2,11 +2,11 @@
2	2	# The atom_types.h file is written to the build directory
3	3	INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
4	4
5		DECLARE_GUILE_CONFIG_TARGET(SCM_CONFIG "opencog as-matrix-config" "ATOMSPACE_TEST")
	5	# DECLARE_GUILE_CONFIG_TARGET(SCM_CONFIG "opencog as-matrix-config" "ATOMSPACE_TEST")
6	6
7	7	ADD_SUBDIRECTORY (matrix)
8	8
9		WRITE_GUILE_CONFIG(${GUILE_BIN_DIR}/opencog/as-matrix-config.scm SCM_CONFIG TRUE)
10
11		WRITE_GUILE_CONFIG(${GUILE_BIN_DIR}/opencog/as-matrix-config-installable.scm SCM_CONFIG FALSE)
12		INSTALL(FILES ${GUILE_BIN_DIR}/opencog/as-matrix-config-installable.scm DESTINATION ${GUILE_SITE_DIR}/opencog RENAME as-matrix-config.scm)
	9	# WRITE_GUILE_CONFIG(${GUILE_BIN_DIR}/opencog/as-matrix-config.scm SCM_CONFIG TRUE)
	10	#
	11	# WRITE_GUILE_CONFIG(${GUILE_BIN_DIR}/opencog/as-matrix-config-installable.scm SCM_CONFIG FALSE)
	12	# INSTALL(FILES ${GUILE_BIN_DIR}/opencog/as-matrix-config-installable.scm DESTINATION ${GUILE_SITE_DIR}/opencog RENAME as-matrix-config.scm)