| … | … | @@ -94,10 +94,6 @@ ENDIF (CYGWIN) |
| 94 | 94 | # =================================================================== |
| 95 | 95 | # Check for existence of various required, optional packages. |
| 96 | 96 | |
| 97 | | # CxxTest setup (also provides OPENCOG_SETUP_TESTING macro) |
| 98 | | INCLUDE(OpenCogTestOptions) |
| 99 | | |
| 100 | | # ------------------------------------------------------------- |
| 101 | 97 | # Look for GNU C++ backtrace. Needed for basic stack printing. |
| 102 | 98 | FIND_PACKAGE(GNUBacktrace) |
| 103 | 99 | IF (GNU_BACKTRACE_FOUND) |
| … | … | @@ -134,10 +130,7 @@ IF (PARALLEL_STL_FOUND) |
| 134 | 130 | ENDIF (PARALLEL_STL_FOUND) |
| 135 | 131 | |
| 136 | 132 | # =================================================================== |
| 137 | | # Global includes |
| 138 | | |
| 139 | | # ------------------------------------------------- |
| 140 | | # Include configuration. |
| 133 | # Global config |
| 141 | 134 | |
| 142 | 135 | # Set default include paths. |
| 143 | 136 | INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) |
| … | … | @@ -145,9 +138,11 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}) |
| 145 | 138 | # Library configuration (LIB_DIR_SUFFIX for lib64, RPATH handling) |
| 146 | 139 | INCLUDE(OpenCogLibOptions) |
| 147 | 140 | |
| 148 | | # ------------------------------------------------- |
| 149 | | # Install configuration |
| 141 | # Setup testing infrastructure (tests target, check target) |
| 142 | INCLUDE(OpenCogTestOptions) |
| 143 | OPENCOG_SETUP_TESTING() |
| 150 | 144 | |
| 145 | # Install configuration |
| 151 | 146 | # Only list install files that have actually changed. |
| 152 | 147 | SET(CMAKE_INSTALL_MESSAGE "LAZY") |
| 153 | 148 | |
| … | … | @@ -168,9 +163,6 @@ ADD_SUBDIRECTORY(etc) |
| 168 | 163 | ADD_SUBDIRECTORY(lib) |
| 169 | 164 | ADD_SUBDIRECTORY(opencog) |
| 170 | 165 | |
| 171 | | # Setup testing infrastructure (tests target, check target) |
| 172 | | OPENCOG_SETUP_TESTING() |
| 173 | | |
| 174 | 166 | ADD_CUSTOM_TARGET(cscope |
| 175 | 167 | COMMAND find opencog examples tests -name '*.cc' -o -name '*.h' -o -name '*.cxxtest' -o -name '*.scm' > ${CMAKE_SOURCE_DIR}/cscope.files |
| 176 | 168 | COMMAND cscope -b |