OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-cogserver commits / e63021a

Remove old nasty libdir install hack
e63021add2e196792d026492c38e10e5e0b1d495
by Linas Vepstas <linasvepstas@gmail.com> · 2025-12-19T03:27:17.000Z

Changed files (10) +14 -14

cmake/CogServerConfig.cmake.in +2 -2
……@@ -4,8 +4,8 @@ include("@CMAKE_INSTALL_PREFIX@/lib/cmake/CogServer/CogServerTargets.cmake")
44
55# libscheme-shell.so is in the modules directory
66link_directories(
7 "@CMAKE_INSTALL_PREFIX@/lib@LIB_DIR_SUFFIX@/opencog/"
8 "@CMAKE_INSTALL_PREFIX@/lib@LIB_DIR_SUFFIX@/opencog/modules"
7 "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/opencog/"
8 "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/opencog/modules"
99)
1010set(COGSERVER_LIBRARIES
1111 network
opencog/cogserver/atoms/CMakeLists.txt +1 -1
……@@ -13,7 +13,7 @@ ADD_GUILE_EXTENSION(SCM_CONFIG servernode "opencog-ext-path-servernode")
1313
1414INSTALL (TARGETS servernode
1515 EXPORT CogServerTargets
16 LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
16 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog"
1717)
1818
1919INSTALL (FILES
opencog/cogserver/attic/proxy/CMakeLists.txt +2 -2
……@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(w-thru-proxy
1212)
1313
1414INSTALL (TARGETS w-thru-proxy
15 LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules")
15 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules")
1616
1717# --------------------------------------
1818
……@@ -29,7 +29,7 @@ TARGET_LINK_LIBRARIES(r-thru-proxy
2929)
3030
3131INSTALL (TARGETS r-thru-proxy
32 LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules")
32 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules")
3333
3434# --------------------------------------
3535
opencog/cogserver/mcp-eval/CMakeLists.txt +1 -1
……@@ -16,7 +16,7 @@ TARGET_LINK_LIBRARIES(mcp-eval
1616
1717INSTALL (TARGETS mcp-eval
1818 EXPORT CogServerTargets
19 DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
19 DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog"
2020)
2121
2222INSTALL (FILES
opencog/cogserver/mcp-tools/CMakeLists.txt +1 -1
……@@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(mcp-tools
1717)
1818
1919INSTALL (TARGETS mcp-tools EXPORT CogServerTargets
20 DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
20 DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog"
2121)
2222
2323INSTALL (FILES
opencog/cogserver/modules/CMakeLists.txt +1 -1
……@@ -11,6 +11,6 @@ TARGET_LINK_LIBRARIES(builtinreqs
1111)
1212
1313INSTALL (TARGETS builtinreqs
14 DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules")
14 DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules")
1515
1616# ------------------------------------------------------------
opencog/cogserver/server/CMakeLists.txt +1 -1
……@@ -44,7 +44,7 @@ INSTALL (TARGETS cogserver RUNTIME DESTINATION "bin")
4444# XXX What does this do? What is the point of this?
4545INSTALL (TARGETS server
4646 EXPORT CogServerTargets
47 DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
47 DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog"
4848)
4949
5050INSTALL (FILES
opencog/cogserver/shell/CMakeLists.txt +3 -3
……@@ -79,14 +79,14 @@ INSTALL (TARGETS
7979 scheme-shell
8080 sexpr-shell
8181 top-shell
82 LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules")
82 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules")
8383
8484IF (HAVE_CYTHON)
8585 INSTALL (TARGETS py-shell
86 LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules")
86 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules")
8787ENDIF (HAVE_CYTHON)
8888
8989IF (HAVE_MCP)
9090 INSTALL (TARGETS mcp-shell
91 LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules")
91 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules")
9292ENDIF (HAVE_MCP)
opencog/cogserver/types/CMakeLists.txt +1 -1
……@@ -26,7 +26,7 @@ TARGET_LINK_LIBRARIES(cogserver-types
2626
2727INSTALL (TARGETS cogserver-types
2828 EXPORT CogServerTargets
29 LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
29 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog"
3030)
3131
3232INSTALL (FILES
opencog/network/CMakeLists.txt +1 -1
……@@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(network
1717# lib directory that lets other packages FIND_PACKAGE(CogServer)
1818INSTALL (TARGETS network
1919 EXPORT CogServerTargets
20 DESTINATION "lib${LIB_DIR_SUFFIX}/opencog"
20 DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog"
2121)
2222
2323# ------------------------------------------------------------