Ignore:
Timestamp:
Jun 8, 2011 1:28:29 PM (8 years ago)
Author:
stefan
Message:

change to new way on how to use and install configuration header files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpConfig.h

    r1670 r1734  
    1 /* $Id$ */
    2 /*
     1/* Copyright (C) 2011
     2 * All Rights Reserved.
     3 * This code is published under the Eclipse Public License.
     4 *
     5 * $Id$
     6 *
    37 * Include file for the configuration of Clp.
    48 *
    59 * On systems where the code is configured with the configure script
    610 * (i.e., compilation is always done with HAVE_CONFIG_H defined), this
    7  * header file includes the automatically generated header file, and
    8  * undefines macros that might configure with other Config.h files.
     11 * header file includes the automatically generated header file.
    912 *
    1013 * On systems that are compiled in other ways (e.g., with the
     
    1215 * macros that depend on the operating system and the compiler.  The
    1316 * macros that define the configuration of the particular user setting
    14  * (e.g., presence of other COIN packages or third party code) are set
    15  * here.  The project maintainer needs to remember to update this file
    16  * and choose reasonable defines.  A user can modify the default
    17  * setting by editing this file here.
    18  *
     17 * (e.g., presence of other COIN-OR packages or third party code) are set
     18 * by the files config_*default.h. The project maintainer needs to remember
     19 * to update these file and choose reasonable defines.
     20 * A user can modify the default setting by editing the config_*default.h files.
    1921 */
    2022
     
    2325
    2426#ifdef HAVE_CONFIG_H
     27#ifdef CLP_BUILD
     28#include "config.h"
     29#else
    2530#include "config_clp.h"
    26 
    27 /* undefine macros that could conflict with those in other config.h
    28    files */
    29 #undef PACKAGE
    30 #undef PACKAGE_BUGREPORT
    31 #undef PACKAGE_NAME
    32 #undef PACKAGE_STRING
    33 #undef PACKAGE_TARNAME
    34 #undef PACKAGE_VERSION
    35 #undef VERSION
     31#endif
    3632
    3733#else /* HAVE_CONFIG_H */
    3834
    39 /* include the COIN-wide system specific configure header */
    40 #include "configall_system.h"
    41 
    42 /***************************************************************************/
    43 /*             HERE DEFINE THE CONFIGURATION SPECIFIC MACROS               */
    44 /***************************************************************************/
    45 
    46 /* Define to the debug sanity check level (0 is no test) */
    47 #define COIN_CLP_CHECKLEVEL 0
    48 
    49 /* Define to the debug verbosity level (0 is no output) */
    50 #define COIN_CLP_VERBOSITY 0
    51 
    52 /* Define to 1 if the Clp package is used */
    53 #define COIN_HAS_CLP 1
    54 
    55 /* Define to 1 if the CoinUtils package is used */
    56 #define COIN_HAS_COINUTILS 1
    57 
    58 /* Define to 1 if readline is available */
    59 /* #undef COIN_HAS_READLINE */
    60 
    61 /* Clp version */
    62 #define CLP_VERSION "trunk"
     35#ifdef CLP_BUILD
     36#include "config_default.h"
     37#else
     38#include "config_clp_default.h"
     39#endif
    6340
    6441#endif /* HAVE_CONFIG_H */
    6542
    66 #endif /*__CLPCONFIG_H__ */
     43#endif /*__CLPCONFIG_H__*/
Note: See TracChangeset for help on using the changeset viewer.