| … | … | @@ -4,8 +4,8 @@ include("@CMAKE_INSTALL_PREFIX@/lib/cmake/CogServer/CogServerTargets.cmake") |
| 4 | 4 | |
| 5 | 5 | # libscheme-shell.so is in the modules directory |
| 6 | 6 | link_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" | |
| 9 | 9 | ) |
| 10 | 10 | set(COGSERVER_LIBRARIES |
| 11 | 11 | network |
| … | … | @@ -13,7 +13,7 @@ ADD_GUILE_EXTENSION(SCM_CONFIG servernode "opencog-ext-path-servernode") |
| 13 | 13 | |
| 14 | 14 | INSTALL (TARGETS servernode |
| 15 | 15 | EXPORT CogServerTargets |
| 16 | LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog" | |
| 16 | LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog" | |
| 17 | 17 | ) |
| 18 | 18 | |
| 19 | 19 | INSTALL (FILES |
| … | … | @@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(w-thru-proxy |
| 12 | 12 | ) |
| 13 | 13 | |
| 14 | 14 | INSTALL (TARGETS w-thru-proxy |
| 15 | LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules") | |
| 15 | LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules") | |
| 16 | 16 | |
| 17 | 17 | # -------------------------------------- |
| 18 | 18 | |
| … | … | @@ -29,7 +29,7 @@ TARGET_LINK_LIBRARIES(r-thru-proxy |
| 29 | 29 | ) |
| 30 | 30 | |
| 31 | 31 | INSTALL (TARGETS r-thru-proxy |
| 32 | LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules") | |
| 32 | LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules") | |
| 33 | 33 | |
| 34 | 34 | # -------------------------------------- |
| 35 | 35 |
| … | … | @@ -16,7 +16,7 @@ TARGET_LINK_LIBRARIES(mcp-eval |
| 16 | 16 | |
| 17 | 17 | INSTALL (TARGETS mcp-eval |
| 18 | 18 | EXPORT CogServerTargets |
| 19 | DESTINATION "lib${LIB_DIR_SUFFIX}/opencog" | |
| 19 | DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog" | |
| 20 | 20 | ) |
| 21 | 21 | |
| 22 | 22 | INSTALL (FILES |
| … | … | @@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(mcp-tools |
| 17 | 17 | ) |
| 18 | 18 | |
| 19 | 19 | INSTALL (TARGETS mcp-tools EXPORT CogServerTargets |
| 20 | DESTINATION "lib${LIB_DIR_SUFFIX}/opencog" | |
| 20 | DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog" | |
| 21 | 21 | ) |
| 22 | 22 | |
| 23 | 23 | INSTALL (FILES |
| … | … | @@ -11,6 +11,6 @@ TARGET_LINK_LIBRARIES(builtinreqs |
| 11 | 11 | ) |
| 12 | 12 | |
| 13 | 13 | INSTALL (TARGETS builtinreqs |
| 14 | DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules") | |
| 14 | DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules") | |
| 15 | 15 | |
| 16 | 16 | # ------------------------------------------------------------ |
| … | … | @@ -44,7 +44,7 @@ INSTALL (TARGETS cogserver RUNTIME DESTINATION "bin") |
| 44 | 44 | # XXX What does this do? What is the point of this? |
| 45 | 45 | INSTALL (TARGETS server |
| 46 | 46 | EXPORT CogServerTargets |
| 47 | DESTINATION "lib${LIB_DIR_SUFFIX}/opencog" | |
| 47 | DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog" | |
| 48 | 48 | ) |
| 49 | 49 | |
| 50 | 50 | INSTALL (FILES |
| … | … | @@ -79,14 +79,14 @@ INSTALL (TARGETS |
| 79 | 79 | scheme-shell |
| 80 | 80 | sexpr-shell |
| 81 | 81 | top-shell |
| 82 | LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules") | |
| 82 | LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules") | |
| 83 | 83 | |
| 84 | 84 | IF (HAVE_CYTHON) |
| 85 | 85 | INSTALL (TARGETS py-shell |
| 86 | LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules") | |
| 86 | LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules") | |
| 87 | 87 | ENDIF (HAVE_CYTHON) |
| 88 | 88 | |
| 89 | 89 | IF (HAVE_MCP) |
| 90 | 90 | INSTALL (TARGETS mcp-shell |
| 91 | LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules") | |
| 91 | LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog/modules") | |
| 92 | 92 | ENDIF (HAVE_MCP) |
| … | … | @@ -26,7 +26,7 @@ TARGET_LINK_LIBRARIES(cogserver-types |
| 26 | 26 | |
| 27 | 27 | INSTALL (TARGETS cogserver-types |
| 28 | 28 | EXPORT CogServerTargets |
| 29 | LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog" | |
| 29 | LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog" | |
| 30 | 30 | ) |
| 31 | 31 | |
| 32 | 32 | INSTALL (FILES |
| … | … | @@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(network |
| 17 | 17 | # lib directory that lets other packages FIND_PACKAGE(CogServer) |
| 18 | 18 | INSTALL (TARGETS network |
| 19 | 19 | EXPORT CogServerTargets |
| 20 | DESTINATION "lib${LIB_DIR_SUFFIX}/opencog" | |
| 20 | DESTINATION "${CMAKE_INSTALL_LIBDIR}/opencog" | |
| 21 | 21 | ) |
| 22 | 22 | |
| 23 | 23 | # ------------------------------------------------------------ |