COIN-OR::LEMON - Graph Library

Ticket #275: 001-prefix-macros.patch

File 001-prefix-macros.patch, 3.0 KB (added by Akos Ladanyi, 11 years ago)

2bfecde015bc

  • CMakeLists.txt

    # HG changeset patch
    # User Akos Ladanyi <ladanyi@tmit.bme.hu>
    # Date 1240858957 -3600
    # Node ID 2bfecde015bc8dab8de245a3010933b2d1c2c2fa
    # Parent  ea417481687374694bf470b613f39c7070671f55
    Prefix macro names with LEMON_ in lemon/config.h (#275)
    
    diff --git a/CMakeLists.txt b/CMakeLists.txt
    a b  
    1515INCLUDE(FindGhostscript)
    1616
    1717INCLUDE(CheckTypeSize)
    18 CHECK_TYPE_SIZE("long long" LONG_LONG)
     18CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
    1919
    2020ENABLE_TESTING()
    2121
  • configure.ac

    diff --git a/configure.ac b/configure.ac
    a b  
    2727dnl Check the existence of long long type.
    2828AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
    2929if test x"$long_long_found" = x"yes"; then
    30   AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
     30  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
    3131fi
    3232
    3333dnl Checks for programs.
  • lemon/bits/default_map.h

    diff --git a/lemon/bits/default_map.h b/lemon/bits/default_map.h
    a b  
    9797  };
    9898
    9999
    100 #if defined HAVE_LONG_LONG
     100#if defined LEMON_HAVE_LONG_LONG
    101101
    102102  // long long
    103103  template <typename _Graph, typename _Item>
  • lemon/config.h.cmake

    diff --git a/lemon/config.h.cmake b/lemon/config.h.cmake
    a b  
    1 #cmakedefine HAVE_LONG_LONG 1
    2  No newline at end of file
     1#cmakedefine LEMON_HAVE_LONG_LONG 1
  • lemon/config.h.in

    diff --git a/lemon/config.h.in b/lemon/config.h.in
    a b  
    11/* Define to 1 if you have CPLEX. */
    2 #undef HAVE_CPLEX
     2#undef LEMON_HAVE_CPLEX
    33
    44/* Define to 1 if you have GLPK. */
    5 #undef HAVE_GLPK
     5#undef LEMON_HAVE_GLPK
    66
    77/* Define to 1 if you have long long */
    8 #undef HAVE_LONG_LONG
     8#undef LEMON_HAVE_LONG_LONG
  • m4/lx_check_cplex.m4

    diff --git a/m4/lx_check_cplex.m4 b/m4/lx_check_cplex.m4
    a b  
    6161    LIBS="$lx_save_libs"
    6262
    6363    if test x"$lx_cplex_found" = x"yes"; then
    64       AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
     64      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
    6565      AC_MSG_RESULT([yes])
    6666    else
    6767      CPLEX_CFLAGS=""
  • m4/lx_check_glpk.m4

    diff --git a/m4/lx_check_glpk.m4 b/m4/lx_check_glpk.m4
    a b  
    5959    LIBS="$lx_save_libs"
    6060
    6161    if test x"$lx_glpk_found" = x"yes"; then
    62       AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
     62      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
    6363      AC_MSG_RESULT([yes])
    6464    else
    6565      GLPK_CFLAGS=""
  • m4/lx_check_soplex.m4

    diff --git a/m4/lx_check_soplex.m4 b/m4/lx_check_soplex.m4
    a b  
    5555    LIBS="$lx_save_libs"
    5656
    5757    if test x"$lx_soplex_found" = x"yes"; then
    58       AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
     58      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
    5959      AC_MSG_RESULT([yes])
    6060    else
    6161      SOPLEX_CXXFLAGS=""