| … | … | @@ -32,6 +32,8 @@ ENDIF (COGUTIL_FOUND) |
| 32 | 32 | list(APPEND CMAKE_MODULE_PATH ${COGUTIL_DATA_DIR}/cmake) |
| 33 | 33 | |
| 34 | 34 | include(${COGUTIL_DATA_DIR}/cmake/OpenCogGccOptions.cmake) |
| 35 | include(${COGUTIL_DATA_DIR}/cmake/OpenCogLibOptions.cmake) |
| 36 | include(${COGUTIL_DATA_DIR}/cmake/OpenCogInstallOptions.cmake) |
| 35 | 37 | include(${COGUTIL_DATA_DIR}/cmake/Summary.cmake) |
| 36 | 38 | |
| 37 | 39 | # =================================================================== |
| … | … | @@ -60,20 +62,8 @@ ENDIF (CXXTEST_FOUND) |
| 60 | 62 | |
| 61 | 63 | # ---------------------------------------------------------- |
| 62 | 64 | # This is required for Guile |
| 63 | | FIND_LIBRARY(GMP_LIBRARY gmp) |
| 64 | | FIND_PATH(GMP_INCLUDE_DIR gmp.h) |
| 65 | | |
| 66 | | # Gnu Guile scheme interpreter |
| 67 | | # Version 2.2.2 is already specified by the atomspace. |
| 68 | | FIND_PACKAGE(Guile 2.2.2.) |
| 69 | | IF (GUILE_FOUND AND GMP_LIBRARY AND GMP_INCLUDE_DIR) |
| 70 | | ADD_DEFINITIONS(-DHAVE_GUILE) |
| 71 | | SET(HAVE_GUILE 1) |
| 72 | | INCLUDE_DIRECTORIES(${GUILE_INCLUDE_DIR}) |
| 73 | | ELSE (GUILE_FOUND AND GMP_LIBRARY AND GMP_INCLUDE_DIR) |
| 74 | | SET(GUILE_DIR_MESSAGE "Guile was not found; needed for guile benchmarks.") |
| 75 | | MESSAGE(STATUS "${GUILE_DIR_MESSAGE}") |
| 76 | | ENDIF (GUILE_FOUND AND GMP_LIBRARY AND GMP_INCLUDE_DIR) |
| 65 | |
| 66 | include(OpenCogFindGuile) |
| 77 | 67 | |
| 78 | 68 | # =================================================================== |
| 79 | 69 | # Global includes |
| … | … | @@ -83,27 +73,6 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} |
| 83 | 73 | |
| 84 | 74 | INCLUDE("${ATOMSPACE_DATA_DIR}/cmake/OpenCogGuile.cmake") |
| 85 | 75 | |
| 86 | | # ------------------------------------------------- |
| 87 | | # Library configuration |
| 88 | | |
| 89 | | # RPATH handling (see https://cmake.org/Wiki/CMake_RPATH_handling) |
| 90 | | # Note: RPATH only supported under Linux! |
| 91 | | # The idea here is that during unit tests, we use the libraries in |
| 92 | | # the build directories, and NOT the system directories. But that |
| 93 | | # means that, during install, the paths have to be tweaked. |
| 94 | | SET(CMAKE_SKIP_BUILD_RPATH FALSE) |
| 95 | | SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) |
| 96 | | SET(CMAKE_INSTALL_RPATH |
| 97 | | "${CMAKE_INSTALL_PREFIX}/lib/opencog" |
| 98 | | "${CMAKE_INSTALL_PREFIX}/lib/opencog/modules") |
| 99 | | SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) |
| 100 | | |
| 101 | | # ------------------------------------------------- |
| 102 | | # Install configuration |
| 103 | | |
| 104 | | # Only list install files that have actually changed. |
| 105 | | SET(CMAKE_INSTALL_MESSAGE "LAZY") |
| 106 | | |
| 107 | 76 | # =================================================================== |
| 108 | 77 | # Add subdirectories |
| 109 | 78 | |