From 9cf7f445f68828d6c529692c69aacf90ba1a0403 Mon Sep 17 00:00:00 2001 From: malaterre Date: Sun, 22 May 2005 18:47:44 +0000 Subject: [PATCH] ENH: Parse the .in file properly with cmake --- src/gdcmjasper/src/libjasper/CMakeLists.txt | 1 + .../src/libjasper/include/jasper/jas_config.h | 190 ------------------ .../libjasper/include/jasper/jas_config2.h | 89 -------- 3 files changed, 1 insertion(+), 279 deletions(-) delete mode 100644 src/gdcmjasper/src/libjasper/include/jasper/jas_config.h delete mode 100644 src/gdcmjasper/src/libjasper/include/jasper/jas_config2.h diff --git a/src/gdcmjasper/src/libjasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/CMakeLists.txt index cdf594f0..dd23f727 100644 --- a/src/gdcmjasper/src/libjasper/CMakeLists.txt +++ b/src/gdcmjasper/src/libjasper/CMakeLists.txt @@ -1,6 +1,7 @@ SUBDIRS(base bmp + include/jasper jp2 jpc jpg diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h deleted file mode 100644 index a50111ad..00000000 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h +++ /dev/null @@ -1,190 +0,0 @@ -/* src/libjasper/include/jasper/jas_config.h. Generated by configure. */ -/* src/libjasper/include/jasper/jas_config.h.in. Generated from configure.ac by autoheader. */ - - -/* Avoid problems due to multiple inclusion. */ -#ifndef JAS_CONFIG_H -#define JAS_CONFIG_H - -/* This preprocessor symbol identifies the version of JasPer. */ -#define JAS_VERSION "1.701.0" -/* If configure is being used, this symbol will be defined automatically - at this point in the configuration header file. */ - -/* The preprocessor symbol JAS_WIN_MSVC_BUILD should not be defined - unless the JasPer software is being built under Microsoft Windows - using Microsoft Visual C. */ -#ifndef JAS_WIN_MSVC_BUILD -/* A configure-based build is being used. */ - - - -/* Extra debugging support */ -/* #undef DEBUG */ - -/* Debugging memory allocator */ -/* #undef DEBUG_MEMALLOC */ - -/* Debugging overflow detection */ -/* #undef DEBUG_OVERFLOW */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_IO_H */ - -/* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDBOOL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Have variable length arrays */ -#define HAVE_VLA 1 - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_WINDOWS_H */ - -/* JasPer configure */ -#define JAS_CONFIGURE 1 - -/* JasPer version */ -#define JAS_VERSION "1.701.0" - -/* Name of package */ -#define PACKAGE "jasper" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "jasper" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "jasper 1.701.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "jasper" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.701.0" - -/* The size of a `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of a `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of a `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 - -/* The size of a `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 - -/* The size of a `unsigned int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_INT 4 - -/* The size of a `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG 4 - -/* The size of a `unsigned long long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_LONG 8 - -/* The size of a `unsigned short', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_SHORT 2 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "1.701.0" - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ - -/* Define to `long long' if does not define. */ -#define longlong long long - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ - -/* Define to `int' if does not define. */ -/* #undef ssize_t */ - -/* Define to `unsigned char' if does not define. */ -#define uchar unsigned char - -/* Define to `unsigned int' if does not define. */ -/* #undef uint */ - -/* Define to `unsigned long' if does not define. */ -/* #undef ulong */ - -/* Define to `unsigned long long' if does not define. */ -#define ulonglong unsigned long long - -/* Define to `unsigned short' if does not define. */ -/* #undef ushort */ - - -#else -/* A configure-based build is not being used. */ -#include -#endif - -#endif - diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config2.h b/src/gdcmjasper/src/libjasper/include/jasper/jas_config2.h deleted file mode 100644 index 75d4f7a3..00000000 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config2.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2002-2003 Michael David Adams. - * All rights reserved. - */ - -/* __START_OF_JASPER_LICENSE__ - * - * JasPer License Version 2.0 - * - * Copyright (c) 1999-2000 Image Power, Inc. - * Copyright (c) 1999-2000 The University of British Columbia - * Copyright (c) 2001-2003 Michael David Adams - * - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person (the - * "User") obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, and/or sell copies of the Software, and to permit - * persons to whom the Software is furnished to do so, subject to the - * following conditions: - * - * 1. The above copyright notices and this permission notice (which - * includes the disclaimer below) shall be included in all copies or - * substantial portions of the Software. - * - * 2. The name of a copyright holder shall not be used to endorse or - * promote products derived from the Software without specific prior - * written permission. - * - * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS - * LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER - * THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL - * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. NO ASSURANCES ARE - * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE - * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY. - * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS - * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL - * PROPERTY RIGHTS OR OTHERWISE. AS A CONDITION TO EXERCISING THE RIGHTS - * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE - * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY. THE SOFTWARE - * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL - * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES, - * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL - * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH - * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH, - * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH - * RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY - * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES. - * - * __END_OF_JASPER_LICENSE__ - */ - -#ifndef JAS_CONFIG2_H -#define JAS_CONFIG2_H - -/* - * Configuration for Microsoft Windows and Microsoft Visual C. - * - * We are not using a configure-based build. - * Try to compensate for this here, by specifying the preprocessor symbols - * normally defined by configure. - */ - -#define uchar unsigned char -#define ushort unsigned short -#define uint unsigned int -#define ulong unsigned long -#define longlong long long -#define ulonglong unsigned long long -/*#define ssize_t int*/ - -#define HAVE_FCNTL_H 1 -#define HAVE_LIMITS_H 1 -#define HAVE_IO_H 1 -#define HAVE_WINDOWS_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STDDEF_H 1 - -#endif -- 2.45.2