Skip to content

Commit

Permalink
Straighten out makefiles so that they work.
Browse files Browse the repository at this point in the history
  • Loading branch information
linas committed Jul 16, 2019
1 parent af11a03 commit e7637fb
Show file tree
Hide file tree
Showing 4 changed files with 704 additions and 11 deletions.
11 changes: 7 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 9,16 @@
# -- print pretty summary
#

CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
# cogutils already requires 2.8.12.2, so may as well ask for that.
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12.2)
IF (COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
CMAKE_POLICY(SET CMP0037 OLD)
ENDIF (COMMAND CMAKE_POLICY)

IF(CMAKE_VERSION VERSION_GREATER 3.0.2)
CMAKE_POLICY(SET CMP0037 OLD)
ENDIF(CMAKE_VERSION VERSION_GREATER 3.0.2)

PROJECT(spacetime)

# ----------------------------------------------------------
Expand Down Expand Up @@ -117,6 121,7 @@ ENDIF (COGUTIL_FOUND)
list(APPEND CMAKE_MODULE_PATH ${COGUTIL_DATA_DIR}/cmake)

include(${COGUTIL_DATA_DIR}/cmake/Summary.cmake)
include(${COGUTIL_DATA_DIR}/cmake/AddCxxtest.cmake)

# ===================================================================
# Check for existance of various required, optional packages.
Expand Down Expand Up @@ -285,8 290,6 @@ IF (CXXTEST_FOUND)
ENDIF (CMAKE_BUILD_TYPE STREQUAL "Coverage")
ENDIF (CXXTEST_FOUND)

ADD_SUBDIRECTORY(examples EXCLUDE_FROM_ALL)

ADD_CUSTOM_TARGET(cscope
COMMAND find opencog examples tests -name '*.cc' -o -name '*.h' -o -name '*.cxxtest' -o -name '*.scm' > ${CMAKE_SOURCE_DIR}/cscope.files
COMMAND cscope -b
Expand Down
Loading

0 comments on commit e7637fb

Please sign in to comment.