diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cmake/FindSWI.cmake | 8 | ||||
| -rw-r--r-- | contrib/ctest/common.ctest.inc | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/contrib/cmake/FindSWI.cmake b/contrib/cmake/FindSWI.cmake index 1106633..3a10269 100644 --- a/contrib/cmake/FindSWI.cmake +++ b/contrib/cmake/FindSWI.cmake @@ -47,6 +47,8 @@ foreach(SWI_SEARCH_PATH ${SWI_SEARCH_PATHS}) endif() endforeach() +#message("SWI_VERSION: ${SWI_VERSION}") + # -- find prolog headers FIND_PATH(SWI_INCLUDE_DIR SWI-Prolog.h PATH_SUFFIXES @@ -55,6 +57,8 @@ FIND_PATH(SWI_INCLUDE_DIR SWI-Prolog.h PATHS ${SWI_SEARCH_PATHS} ) +#message("SWI_INCLUDE_DIR: ${SWI_INCLUDE_DIR}") + FIND_PATH(SWI_CPP_INCLUDE_DIR SWI-cpp.h PATH_SUFFIXES packages/cpp @@ -62,6 +66,8 @@ FIND_PATH(SWI_CPP_INCLUDE_DIR SWI-cpp.h PATHS ${SWI_SEARCH_PATHS} ) +#message("SWI_CPP_INCLUDE_DIR: ${SWI_CPP_INCLUDE_DIR}") + FIND_PROGRAM(SWI_BINARY swipl PATH_SUFFIXES src @@ -69,6 +75,8 @@ FIND_PROGRAM(SWI_BINARY swipl PATHS ${SWI_SEARCH_PATHS} ) +#message("SWI_BINARY: ${SWI_BINARY}") + FIND_LIBRARY(SWI_LIBRARY_RELEASE NAMES libswipl swipl PATH_SUFFIXES diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc index 4fa5829..6a6f286 100644 --- a/contrib/ctest/common.ctest.inc +++ b/contrib/ctest/common.ctest.inc @@ -36,8 +36,8 @@ set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1048576) ### Coverage and Memory checks? (untested) ################################ -#set(WITH_COVERAGE TRUE) -#find_program(CTEST_COVERAGE_COMMAND NAMES gcov) +set(WITH_COVERAGE TRUE) +find_program(CTEST_COVERAGE_COMMAND NAMES gcov) #set(WITH_MEMCHECK TRUE) #find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind) @@ -71,9 +71,9 @@ set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTO ### Test! ################################################################ # clean build directory for everything but continuous tests -if (NOT ${CTEST_SUBMIT_TYPE} MATCHES ".*Continuous.*") +#if (NOT ${CTEST_SUBMIT_TYPE} MATCHES ".*Continuous.*") ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) -endif() +#endif() ctest_start(${CTEST_SUBMIT_TYPE}) # start testing # @@ -106,11 +106,11 @@ endif() ctest_build() # build custom target that depends on all the actual tests ctest_test() # run tests -if (WITH_MEMCHECK AND CTEST_COVERAGE_COMMAND) +if(CTEST_COVERAGE_COMMAND) ctest_coverage() -endif (WITH_MEMCHECK AND CTEST_COVERAGE_COMMAND) -if (WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND) +endif() +if (WITH_MEMCHECK) ctest_memcheck() -endif (WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND) +endif() ctest_submit() # submit |