commit 6d96c307282fe5d5ab5d165f8c94aa44d850459f Author: Joel Smith <joel_sm...@appsig.com> Date: Sun May 16 09:27:31 2010 -0600
cmake updates for libmp4v2 detection and endian.h header CMakeLists.txt | 10 ++++++++++ cmake/config.h.in | 9 +++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 058604d..c9731b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ endif() include(flex) include(CheckIncludeFile) +include(CheckIncludeFiles) find_package(PkgConfig REQUIRED) find_package(GTK2 REQUIRED) @@ -42,6 +43,15 @@ find_package(Glade REQUIRED) find_package(LibXml2 REQUIRED) find_package(Libgpod REQUIRED) find_package(ID3tag REQUIRED) +CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H) +CHECK_INCLUDE_FILES(mp4v2/platform.h HAVE_MP4V2_PLATFORM_H) + +# This is hacky... the result is a test file that looks like this: +# #include <mp4v2/platform.h> +# typedef void* MP4FileHandle;//> +# #include <mp4v2/itmf_tags.h> +# This matches the way it's used in the code, and the autoconf test +CHECK_INCLUDE_FILES("mp4v2/platform.h>\ntypedef void* MP4FileHandle\;//;mp4v2/itmf_tags.h" HAVE_MP4V2_ITMF_TAGS_H) set(OPT_INCLUDES "") set(OPT_CFLAGS "") diff --git a/cmake/config.h.in b/cmake/config.h.in index 96517df..9d99fb0 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -9,6 +9,9 @@ /* Define if you have curl support */ #cmakedefine HAVE_CURL +/* Define to 1 if you have the <endian.h> header file. */ +#cmakedefine HAVE_ENDIAN_H 1 + /* Define if you have the flac library */ #cmakedefine HAVE_FLAC @@ -21,6 +24,12 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #cmakedefine HAVE_INTTYPES_H 1 +/* Define to 1 if you have the <mp4v2/itmf_tags.h> header file. */ +#cmakedefine HAVE_MP4V2_ITMF_TAGS_H 1 + +/* Define to 1 if you have the <mp4v2/platform.h> header file. */ +#cmakedefine HAVE_MP4V2_PLATFORM_H 1 + /* Define to 1 if you have the <stdint.h> header file. */ #cmakedefine HAVE_STDINT_H 1 ------------------------------------------------------------------------------ _______________________________________________ gtkpod-cvs2 mailing list gtkpod-cvs2@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2