From 753ceccfb4517ae0aa4445c18ae34ca52171f28d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 12 Mar 2018 09:48:00 +0100 Subject: Add CMake --- config.h.cmake.in | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 config.h.cmake.in (limited to 'config.h.cmake.in') diff --git a/config.h.cmake.in b/config.h.cmake.in new file mode 100644 index 00000000..11e0a87c --- /dev/null +++ b/config.h.cmake.in @@ -0,0 +1,62 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if Cairo is available */ +#cmakedefine HAVE_CAIRO + +/* Define to 1 if clock_gettime is available. */ +#cmakedefine HAVE_CLOCK_GETTIME + +/* Define to 1 if sched_setaffinity is available. */ +#undef HAVE_CPU_AFFINITY + +/* Define to 1 if a SysV or X/Open compatible Curses library is present */ +#undef HAVE_CURSES + +/* Define to 1 if library supports color (enhanced functions) */ +#undef HAVE_CURSES_COLOR + +/* Define to 1 if FFTW is available */ +#cmakedefine HAVE_FFTW + +/* Define to 1 if GTK and GDK are available */ +#cmakedefine HAVE_GTK + +/* Define to 1 if OpenCL is available */ +#cmakedefine HAVE_OPENCL + +/* Define to 1 if CL/cl.h should be used */ +#cmakedefine HAVE_CL_CL_H + +/* Define to 1 if libTIFF is available */ +#cmakedefine HAVE_TIFF + +/* Define to 1 if libxgandalf is available */ +#cmakedefine HAVE_XGANDALF + +/* Define to 1 if libfastDiffractionImageProcessing is available */ +#cmakedefine HAVE_FDIP + +/* Define to 1 if libcbf is available */ +#cmakedefine HAVE_CBFLIB + +/* Name of package */ +#define PACKAGE "crystfel" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "taw@physics.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "crystfel" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "crystfel 0.6.2" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "crystfel" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.6.3" + -- cgit v1.2.3 From ea8e7bc35e5c09096c04f5c269451a330d59c49b Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 13 Mar 2018 10:01:13 +0100 Subject: Nicer way of getting Git revision This will need a separate way to create the official releases (which shouldn't have Git revisions attached) --- config.h.cmake.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config.h.cmake.in') diff --git a/config.h.cmake.in b/config.h.cmake.in index 11e0a87c..e56aeab6 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -60,3 +60,10 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "0.6.3" +#define CRYSTFEL_VERSIONSTRING "+@GIT_SHA1@" + +#define CRYSTFEL_BOILERPLATE "License GPLv3+: GNU GPL version 3 or later"\ + " .\n"\ + "This is free software: you are free to change and redistribute it.\n"\ + "There is NO WARRANTY, to the extent permitted by law.\n\n"\ + "Written by Thomas White and others." -- cgit v1.2.3 From f686ee8e039b6145b12bff3420d02784e95d2621 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 21 Mar 2018 11:36:45 +0100 Subject: Clean up config.h.cmake.in --- config.h.cmake.in | 53 +++++------------------------------------------------ 1 file changed, 5 insertions(+), 48 deletions(-) (limited to 'config.h.cmake.in') diff --git a/config.h.cmake.in b/config.h.cmake.in index e56aeab6..cf124972 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -1,63 +1,20 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if Cairo is available */ #cmakedefine HAVE_CAIRO - -/* Define to 1 if clock_gettime is available. */ #cmakedefine HAVE_CLOCK_GETTIME - -/* Define to 1 if sched_setaffinity is available. */ -#undef HAVE_CPU_AFFINITY - -/* Define to 1 if a SysV or X/Open compatible Curses library is present */ -#undef HAVE_CURSES - -/* Define to 1 if library supports color (enhanced functions) */ -#undef HAVE_CURSES_COLOR - -/* Define to 1 if FFTW is available */ +#cmakedefine HAVE_CPU_AFFINITY #cmakedefine HAVE_FFTW - -/* Define to 1 if GTK and GDK are available */ #cmakedefine HAVE_GTK - -/* Define to 1 if OpenCL is available */ #cmakedefine HAVE_OPENCL - -/* Define to 1 if CL/cl.h should be used */ #cmakedefine HAVE_CL_CL_H - -/* Define to 1 if libTIFF is available */ #cmakedefine HAVE_TIFF - -/* Define to 1 if libxgandalf is available */ #cmakedefine HAVE_XGANDALF - -/* Define to 1 if libfastDiffractionImageProcessing is available */ #cmakedefine HAVE_FDIP - -/* Define to 1 if libcbf is available */ #cmakedefine HAVE_CBFLIB -/* Name of package */ -#define PACKAGE "crystfel" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "taw@physics.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "crystfel" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "crystfel 0.6.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "crystfel" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" +/* Implement us .... */ +#undef HAVE_CURSES +#undef HAVE_CURSES_COLOR +#undef HAVE_SAVE_TO_PNG -/* Define to the version of this package. */ #define PACKAGE_VERSION "0.6.3" #define CRYSTFEL_VERSIONSTRING "+@GIT_SHA1@" -- cgit v1.2.3 From 0b849787cd825f5d4e5b16f1e64552ecb10d0b76 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 21 Mar 2018 11:43:49 +0100 Subject: Fix CBFlib detection --- config.h.cmake.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config.h.cmake.in') diff --git a/config.h.cmake.in b/config.h.cmake.in index cf124972..1188c90e 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -8,7 +8,14 @@ #cmakedefine HAVE_TIFF #cmakedefine HAVE_XGANDALF #cmakedefine HAVE_FDIP + +/* We avoid adding the full path to cbf.h, because CBFlib unhelpfully installs + * some conflicting HDF5 headers which we want to keep out of the include path. + * Unfortunately, sometimes CBFlib installs cbf/cbf.h, other times cbflib/cbf.h. + * These defines tell whether we have CBFlib at all, and if so, what to #include */ #cmakedefine HAVE_CBFLIB +#cmakedefine HAVE_CBF_CBF_H +#cmakedefine HAVE_CBFLIB_CBF_H /* Implement us .... */ #undef HAVE_CURSES -- cgit v1.2.3 From 018bff49cd1f5fbd3071b092d0546be67147e893 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 21 Mar 2018 16:53:31 +0100 Subject: Separate tests for gdk-pixbuf-2.0 and GDK --- config.h.cmake.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config.h.cmake.in') diff --git a/config.h.cmake.in b/config.h.cmake.in index 1188c90e..5cf46cdd 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -3,6 +3,8 @@ #cmakedefine HAVE_CPU_AFFINITY #cmakedefine HAVE_FFTW #cmakedefine HAVE_GTK +#cmakedefine HAVE_GDKPIXBUF +#cmakedefine HAVE_GDK #cmakedefine HAVE_OPENCL #cmakedefine HAVE_CL_CL_H #cmakedefine HAVE_TIFF @@ -20,7 +22,6 @@ /* Implement us .... */ #undef HAVE_CURSES #undef HAVE_CURSES_COLOR -#undef HAVE_SAVE_TO_PNG #define PACKAGE_VERSION "0.6.3" -- cgit v1.2.3 From fba58042c236d8ceec09c7310583797401eda0ab Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 22 Mar 2018 11:26:35 +0100 Subject: Test for Curses --- config.h.cmake.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'config.h.cmake.in') diff --git a/config.h.cmake.in b/config.h.cmake.in index 5cf46cdd..d30e2485 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -10,6 +10,7 @@ #cmakedefine HAVE_TIFF #cmakedefine HAVE_XGANDALF #cmakedefine HAVE_FDIP +#cmakedefine HAVE_CURSES /* We avoid adding the full path to cbf.h, because CBFlib unhelpfully installs * some conflicting HDF5 headers which we want to keep out of the include path. @@ -19,10 +20,6 @@ #cmakedefine HAVE_CBF_CBF_H #cmakedefine HAVE_CBFLIB_CBF_H -/* Implement us .... */ -#undef HAVE_CURSES -#undef HAVE_CURSES_COLOR - #define PACKAGE_VERSION "0.6.3" #define CRYSTFEL_VERSIONSTRING "+@GIT_SHA1@" -- cgit v1.2.3 From 00e75c577fa1069d24188bb7750fea1bc3723865 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 22 Mar 2018 15:29:11 +0100 Subject: Add proper version number --- config.h.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config.h.cmake.in') diff --git a/config.h.cmake.in b/config.h.cmake.in index d30e2485..2db30860 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -20,9 +20,9 @@ #cmakedefine HAVE_CBF_CBF_H #cmakedefine HAVE_CBFLIB_CBF_H -#define PACKAGE_VERSION "0.6.3" +#define PACKAGE_VERSION "${PROJECT_VERSION}" -#define CRYSTFEL_VERSIONSTRING "+@GIT_SHA1@" +#define CRYSTFEL_VERSIONSTRING "${PROJECT_VERSION}+${GIT_SHA1}" #define CRYSTFEL_BOILERPLATE "License GPLv3+: GNU GPL version 3 or later"\ " .\n"\ -- cgit v1.2.3