Fix required by suitesparse to build Mongoose The CMakeLists.txt of Mongoose assumes that SuiteSparse_config has been installed into the suitesparse source directory, which is not the case for us, as we are building suitesparse out-of-tree. SuiteSparse_config can instead be found in the ${CMAKE_INSTALL_PREFIX} directory. diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt index 7e134ab..76fa9e2 100644 --- a/Mongoose/CMakeLists.txt +++ b/Mongoose/CMakeLists.txt @@ -148,10 +148,10 @@ set(CMAKE_CXX_STANDARD 11) #set(CMAKE_CXX_STANDARD_REQUIRED ON) # determine which SuiteSparse_config to use -if (EXISTS ${PROJECT_SOURCE_DIR}/../SuiteSparse_config) - message(STATUS "External ../SuiteSparse_config" ${BoldBlue} " found" ${ColourReset} ".") +if (EXISTS ${CMAKE_INSTALL_PREFIX}) + message(STATUS "External SuiteSparse_config" ${BoldBlue} " found" ${ColourReset} ".") set ( SUITESPARSE_CONFIG_DIR ${PROJECT_SOURCE_DIR}/../SuiteSparse_config ) - link_directories ( ${PROJECT_SOURCE_DIR}/../lib ) + link_directories ( ${CMAKE_INSTALL_PREFIX}/lib ) message ( STATUS "Note: ../SuiteSparse_config must be compiled before compiling Mongoose" ) set ( SUITESPARSE_CONFIG_LIBRARY suitesparseconfig ) else () 143d559528c8b644ec43bb21e8'>treecommitdiff
path: root/gnu/tests/data
AgeCommit message (Expand)Author
2021-08-02Reinstate "services: Add a service for Jami."...This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below. Thanks to Christopher Baines for reporting the failure and proposing a fix. * guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data files via the 'extra-files' argument. * gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat file to... * gnu/local.mk (MODULES_NOT_COMPILED): ... here. Maxim Cournoyer
2021-08-02Revert "services: Add a service for Jami."...This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b. It broke 'guix pull'. Maxim Cournoyer
2021-08-02services: Add a service for Jami....* gnu/services/telephony.scm (string-or-computed-file?) (string-list?, account-fingerprint-list?): New procedures. (maybe-string-list, maybe-account-fingerprint-list) (maybe-boolean, maybe-string, jami-account-list): New configuration field types. (serialize-string-list, serialize-boolean, serialize-string) (jami-account, jami-account->alist, jami-configuration) (jami-account-list?, jami-account-list-maybe): New procedures. (%jami-accounts): New variable. (jami-configuration->command-line-arguments): New procedure. (jami-dbus-session-activation, jami-shepherd-services): New procedures. (jami-service-type): New variable. * gnu/build/jami-service.scm: New file. * gnu/tests/data/jami-dummy-account.dat: Likewise. * gnu/tests/telephony.scm: Likewise. * gnu/local.mk (GNU_SYSTEM_MODULES): Register them. * Makefile.am (SCM_TESTS): Register the test file. (dist_patch_DATA): Register the new data file. * doc/guix.texi (Telephony Services): Document it. Maxim Cournoyer