--- cmake/FindGuile.cmake | 13 ++++++++----- src/guile.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/cmake/FindGuile.cmake b/cmake/FindGuile.cmake index 8b93daa..3dd670b 100644 --- a/cmake/FindGuile.cmake +++ b/cmake/FindGuile.cmake @@ -2,15 +2,18 @@ # Note: `guile-config` ultimately calls pkg-config anyway # Nothing gets marked `advanced` since there aren't that many variables -find_program(GUILE_SNARF NAMES guile-snarf guile-snarf2.2 guile-snarf2.0) +find_program(GUILE_SNARF NAMES guile-snarf guile-snarf-3.0 guile-snarf2.2 guile-snarf2.0) # PkgConfig is only there to provide hints find_package(PkgConfig) pkg_check_modules(PC_GUILE QUIET guile) if (NOT PC_GUILE_FOUND) - pkg_check_modules(PC_GUILE QUIET guile-2.2) + pkg_check_modules(PC_GUILE QUIET guile-3.0) if (NOT PC_GUILE_FOUND) - pkg_check_modules(PC_GUILE QUIET guile-2.0) + pkg_check_modules(PC_GUILE QUIET guile-2.2) + if (NOT PC_GUILE_FOUND) + pkg_check_modules(PC_GUILE QUIET guile-2.0) + endif(NOT PC_GUILE_FOUND) endif(NOT PC_GUILE_FOUND) endif(NOT PC_GUILE_FOUND) @@ -19,9 +22,9 @@ set(GUILE_DEFINITIONS ${PC_GUILE_CFLAGS_OTHER}) find_path(GUILE_INCLUDE_DIR libguile.h HINTS ${PC_GUILE_INCLUDEDIR} ${PC_GUILE_INCLUDE_DIRS} - PATH_SUFFIXES guile guile/2.2 guile/2.0) + PATH_SUFFIXES guile guile/3.0 guile/2.2 guile/2.0) -find_library(GUILE_LIBRARY NAMES guile guile-2.2 guile-2.0 +find_library(GUILE_LIBRARY NAMES guile guile-3.0 guile-2.2 guile-2.0 HINTS ${PC_GUILE_LIBDIR} ${PC_GUILE_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) diff --git a/src/guile.h b/src/guile.h index 26484fb..d1ec12d 100644 --- a/src/guile.h +++ b/src/guile.h @@ -21,7 +21,7 @@ #ifndef GUILE_H #define GUILE_H -#include <libguile/__scm.h> +#include <libguile.h> void initGuileInterface(); SCM smobAnimated_make(class Animated* a); -- 2.29.2