Merge and extend the fix of #275
authorAkos Ladanyi <ladanyi@tmit.bme.hu>
Tue, 28 Apr 2009 13:51:34 +0100
changeset 67420dac2104519
parent 673 58357e986a08
parent 540 8a144437db7d
child 675 586b65073025
Merge and extend the fix of #275
CMakeLists.txt
cmake/FindCOIN.cmake
cmake/FindCPLEX.cmake
cmake/FindGLPK.cmake
configure.ac
demo/CMakeLists.txt
lemon/CMakeLists.txt
lemon/Makefile.am
lemon/bits/default_map.h
lemon/config.h.cmake
lemon/config.h.in
lemon/lp.h
m4/lx_check_coin.m4
m4/lx_check_cplex.m4
m4/lx_check_glpk.m4
m4/lx_check_soplex.m4
test/CMakeLists.txt
test/lp_test.cc
test/mip_test.cc
tools/dimacs-solver.cc
     1.1 --- a/CMakeLists.txt	Sun Apr 26 16:36:23 2009 +0100
     1.2 +++ b/CMakeLists.txt	Tue Apr 28 13:51:34 2009 +0100
     1.3 @@ -28,8 +28,10 @@
     1.4  # C4996: 'function': was declared deprecated
     1.5  ENDIF(MSVC)
     1.6  
     1.7 +ADD_DEFINITIONS(-DHAVE_CONFIG_H)
     1.8 +
     1.9  INCLUDE(CheckTypeSize)
    1.10 -CHECK_TYPE_SIZE("long long" LONG_LONG)
    1.11 +CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
    1.12  
    1.13  ENABLE_TESTING()
    1.14  
     2.1 --- a/cmake/FindCOIN.cmake	Sun Apr 26 16:36:23 2009 +0100
     2.2 +++ b/cmake/FindCOIN.cmake	Tue Apr 28 13:51:34 2009 +0100
     2.3 @@ -61,8 +61,8 @@
     2.4  )
     2.5  
     2.6  IF(COIN_FOUND)
     2.7 -  SET(HAVE_LP TRUE)
     2.8 -  SET(HAVE_MIP TRUE)
     2.9 -  SET(HAVE_CLP TRUE)
    2.10 -  SET(HAVE_CBC TRUE)
    2.11 +  SET(LEMON_HAVE_LP TRUE)
    2.12 +  SET(LEMON_HAVE_MIP TRUE)
    2.13 +  SET(LEMON_HAVE_CLP TRUE)
    2.14 +  SET(LEMON_HAVE_CBC TRUE)
    2.15  ENDIF(COIN_FOUND)
     3.1 --- a/cmake/FindCPLEX.cmake	Sun Apr 26 16:36:23 2009 +0100
     3.2 +++ b/cmake/FindCPLEX.cmake	Tue Apr 28 13:51:34 2009 +0100
     3.3 @@ -21,7 +21,7 @@
     3.4  MARK_AS_ADVANCED(CPLEX_LIBRARY CPLEX_INCLUDE_DIR CPLEX_BIN_DIR)
     3.5  
     3.6  IF(CPLEX_FOUND)
     3.7 -  SET(HAVE_LP TRUE)
     3.8 -  SET(HAVE_MIP TRUE)
     3.9 -  SET(HAVE_CPLEX TRUE)
    3.10 +  SET(LEMON_HAVE_LP TRUE)
    3.11 +  SET(LEMON_HAVE_MIP TRUE)
    3.12 +  SET(LEMON_HAVE_CPLEX TRUE)
    3.13  ENDIF(CPLEX_FOUND)
     4.1 --- a/cmake/FindGLPK.cmake	Sun Apr 26 16:36:23 2009 +0100
     4.2 +++ b/cmake/FindGLPK.cmake	Tue Apr 28 13:51:34 2009 +0100
     4.3 @@ -21,7 +21,7 @@
     4.4  MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)
     4.5  
     4.6  IF(GLPK_FOUND)
     4.7 -  SET(HAVE_LP TRUE)
     4.8 -  SET(HAVE_MIP TRUE)
     4.9 -  SET(HAVE_GLPK TRUE)
    4.10 +  SET(LEMON_HAVE_LP TRUE)
    4.11 +  SET(LEMON_HAVE_MIP TRUE)
    4.12 +  SET(LEMON_HAVE_GLPK TRUE)
    4.13  ENDIF(GLPK_FOUND)
     5.1 --- a/configure.ac	Sun Apr 26 16:36:23 2009 +0100
     5.2 +++ b/configure.ac	Tue Apr 28 13:51:34 2009 +0100
     5.3 @@ -25,7 +25,7 @@
     5.4  dnl Check the existence of long long type.
     5.5  AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
     5.6  if test x"$long_long_found" = x"yes"; then
     5.7 -  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
     5.8 +  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
     5.9  fi
    5.10  
    5.11  dnl Checks for programs.
     6.1 --- a/lemon/CMakeLists.txt	Sun Apr 26 16:36:23 2009 +0100
     6.2 +++ b/lemon/CMakeLists.txt	Tue Apr 28 13:51:34 2009 +0100
     6.3 @@ -18,7 +18,7 @@
     6.4    bits/windows.cc
     6.5  )
     6.6  
     6.7 -IF(HAVE_GLPK)
     6.8 +IF(LEMON_HAVE_GLPK)
     6.9    SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
    6.10    INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
    6.11    IF(WIN32)
    6.12 @@ -26,22 +26,22 @@
    6.13      INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
    6.14      INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
    6.15    ENDIF(WIN32)
    6.16 -ENDIF(HAVE_GLPK)
    6.17 +ENDIF(LEMON_HAVE_GLPK)
    6.18  
    6.19 -IF(HAVE_CPLEX)
    6.20 +IF(LEMON_HAVE_CPLEX)
    6.21    SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
    6.22    INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
    6.23 -ENDIF(HAVE_CPLEX)
    6.24 +ENDIF(LEMON_HAVE_CPLEX)
    6.25  
    6.26 -IF(HAVE_CLP)
    6.27 +IF(LEMON_HAVE_CLP)
    6.28    SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
    6.29    INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
    6.30 -ENDIF(HAVE_CLP)
    6.31 +ENDIF(LEMON_HAVE_CLP)
    6.32  
    6.33 -IF(HAVE_CBC)
    6.34 +IF(LEMON_HAVE_CBC)
    6.35    SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
    6.36    INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
    6.37 -ENDIF(HAVE_CBC)
    6.38 +ENDIF(LEMON_HAVE_CBC)
    6.39  
    6.40  ADD_LIBRARY(lemon ${LEMON_SOURCES})
    6.41  
    6.42 @@ -55,3 +55,8 @@
    6.43    DESTINATION include/lemon
    6.44    COMPONENT headers
    6.45    FILES_MATCHING PATTERN "*.h")
    6.46 +
    6.47 +INSTALL(
    6.48 +  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
    6.49 +  DESTINATION include/lemon
    6.50 +  COMPONENT headers)
     7.1 --- a/lemon/Makefile.am	Sun Apr 26 16:36:23 2009 +0100
     7.2 +++ b/lemon/Makefile.am	Tue Apr 28 13:51:34 2009 +0100
     7.3 @@ -61,6 +61,7 @@
     7.4  	lemon/clp.h \
     7.5  	lemon/color.h \
     7.6  	lemon/concept_check.h \
     7.7 +	lemon/config.h \
     7.8  	lemon/connectivity.h \
     7.9  	lemon/counter.h \
    7.10  	lemon/core.h \
     8.1 --- a/lemon/bits/default_map.h	Sun Apr 26 16:36:23 2009 +0100
     8.2 +++ b/lemon/bits/default_map.h	Tue Apr 28 13:51:34 2009 +0100
     8.3 @@ -97,7 +97,7 @@
     8.4    };
     8.5  
     8.6  
     8.7 -#if defined HAVE_LONG_LONG
     8.8 +#if defined LEMON_HAVE_LONG_LONG
     8.9  
    8.10    // long long
    8.11    template <typename _Graph, typename _Item>
     9.1 --- a/lemon/config.h.cmake	Sun Apr 26 16:36:23 2009 +0100
     9.2 +++ b/lemon/config.h.cmake	Tue Apr 28 13:51:34 2009 +0100
     9.3 @@ -1,7 +1,7 @@
     9.4 -#cmakedefine HAVE_LONG_LONG 1
     9.5 -#cmakedefine HAVE_LP 1
     9.6 -#cmakedefine HAVE_MIP 1
     9.7 -#cmakedefine HAVE_GLPK 1
     9.8 -#cmakedefine HAVE_CPLEX 1
     9.9 -#cmakedefine HAVE_CLP 1
    9.10 -#cmakedefine HAVE_CBC 1
    9.11 +#cmakedefine LEMON_HAVE_LONG_LONG 1
    9.12 +#cmakedefine LEMON_HAVE_LP 1
    9.13 +#cmakedefine LEMON_HAVE_MIP 1
    9.14 +#cmakedefine LEMON_HAVE_GLPK 1
    9.15 +#cmakedefine LEMON_HAVE_CPLEX 1
    9.16 +#cmakedefine LEMON_HAVE_CLP 1
    9.17 +#cmakedefine LEMON_HAVE_CBC 1
    10.1 --- a/lemon/config.h.in	Sun Apr 26 16:36:23 2009 +0100
    10.2 +++ b/lemon/config.h.in	Tue Apr 28 13:51:34 2009 +0100
    10.3 @@ -1,23 +1,23 @@
    10.4  /* Define to 1 if you have long long */
    10.5 -#undef HAVE_LONG_LONG
    10.6 +#undef LEMON_HAVE_LONG_LONG
    10.7  
    10.8  /* Define to 1 if you have any LP solver. */
    10.9 -#undef HAVE_LP
   10.10 +#undef LEMON_HAVE_LP
   10.11  
   10.12  /* Define to 1 if you have any MIP solver. */
   10.13 -#undef HAVE_MIP
   10.14 +#undef LEMON_HAVE_MIP
   10.15  
   10.16  /* Define to 1 if you have CPLEX. */
   10.17 -#undef HAVE_CPLEX
   10.18 +#undef LEMON_HAVE_CPLEX
   10.19  
   10.20  /* Define to 1 if you have GLPK. */
   10.21 -#undef HAVE_GLPK
   10.22 +#undef LEMON_HAVE_GLPK
   10.23  
   10.24  /* Define to 1 if you have SOPLEX */
   10.25 -#undef HAVE_SOPLEX
   10.26 +#undef LEMON_HAVE_SOPLEX
   10.27  
   10.28  /* Define to 1 if you have CLP */
   10.29 -#undef HAVE_CLP
   10.30 +#undef LEMON_HAVE_CLP
   10.31  
   10.32  /* Define to 1 if you have CBC */
   10.33 -#undef HAVE_CBC
   10.34 +#undef LEMON_HAVE_CBC
    11.1 --- a/lemon/lp.h	Sun Apr 26 16:36:23 2009 +0100
    11.2 +++ b/lemon/lp.h	Tue Apr 28 13:51:34 2009 +0100
    11.3 @@ -22,13 +22,13 @@
    11.4  #include<lemon/config.h>
    11.5  
    11.6  
    11.7 -#ifdef HAVE_GLPK
    11.8 +#ifdef LEMON_HAVE_GLPK
    11.9  #include <lemon/glpk.h>
   11.10 -#elif HAVE_CPLEX
   11.11 +#elif LEMON_HAVE_CPLEX
   11.12  #include <lemon/cplex.h>
   11.13 -#elif HAVE_SOPLEX
   11.14 +#elif LEMON_HAVE_SOPLEX
   11.15  #include <lemon/soplex.h>
   11.16 -#elif HAVE_CLP
   11.17 +#elif LEMON_HAVE_CLP
   11.18  #include <lemon/clp.h>
   11.19  #endif
   11.20  
   11.21 @@ -69,20 +69,20 @@
   11.22    ///Currently, it is either \c GlpkMip or \c CplexMip
   11.23    typedef GlpkMip Mip;
   11.24  #else
   11.25 -#ifdef HAVE_GLPK
   11.26 +#ifdef LEMON_HAVE_GLPK
   11.27  # define LEMON_DEFAULT_LP GLPK
   11.28    typedef GlpkLp Lp;
   11.29  # define LEMON_DEFAULT_MIP GLPK
   11.30    typedef GlpkMip Mip;
   11.31 -#elif HAVE_CPLEX
   11.32 +#elif LEMON_HAVE_CPLEX
   11.33  # define LEMON_DEFAULT_LP CPLEX
   11.34    typedef CplexLp Lp;
   11.35  # define LEMON_DEFAULT_MIP CPLEX
   11.36    typedef CplexMip Mip;
   11.37 -#elif HAVE_SOPLEX
   11.38 +#elif LEMON_HAVE_SOPLEX
   11.39  # define DEFAULT_LP SOPLEX
   11.40    typedef SoplexLp Lp;
   11.41 -#elif HAVE_CLP
   11.42 +#elif LEMON_HAVE_CLP
   11.43  # define DEFAULT_LP CLP
   11.44    typedef ClpLp Lp;  
   11.45  #endif
    12.1 --- a/m4/lx_check_coin.m4	Sun Apr 26 16:36:23 2009 +0100
    12.2 +++ b/m4/lx_check_coin.m4	Tue Apr 28 13:51:34 2009 +0100
    12.3 @@ -55,9 +55,9 @@
    12.4      LIBS="$lx_save_libs"
    12.5  
    12.6      if test x"$lx_clp_found" = x"yes"; then
    12.7 -      AC_DEFINE([HAVE_CLP], [1], [Define to 1 if you have CLP.])
    12.8 +      AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.])
    12.9        lx_lp_found=yes
   12.10 -      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   12.11 +      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   12.12        AC_MSG_RESULT([yes])
   12.13      else
   12.14        CLP_CXXFLAGS=""
   12.15 @@ -115,11 +115,11 @@
   12.16        LIBS="$lx_save_libs"
   12.17  
   12.18        if test x"$lx_cbc_found" = x"yes"; then
   12.19 -        AC_DEFINE([HAVE_CBC], [1], [Define to 1 if you have CBC.])
   12.20 +        AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.])
   12.21          lx_lp_found=yes
   12.22 -        AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   12.23 +        AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   12.24          lx_mip_found=yes
   12.25 -        AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
   12.26 +        AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
   12.27          AC_MSG_RESULT([yes])
   12.28        else
   12.29          CBC_CXXFLAGS=""
    13.1 --- a/m4/lx_check_cplex.m4	Sun Apr 26 16:36:23 2009 +0100
    13.2 +++ b/m4/lx_check_cplex.m4	Tue Apr 28 13:51:34 2009 +0100
    13.3 @@ -61,11 +61,11 @@
    13.4      LIBS="$lx_save_libs"
    13.5  
    13.6      if test x"$lx_cplex_found" = x"yes"; then
    13.7 -      AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
    13.8 +      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
    13.9        lx_lp_found=yes
   13.10 -      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   13.11 +      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   13.12        lx_mip_found=yes
   13.13 -      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
   13.14 +      AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
   13.15        AC_MSG_RESULT([yes])
   13.16      else
   13.17        CPLEX_CFLAGS=""
    14.1 --- a/m4/lx_check_glpk.m4	Sun Apr 26 16:36:23 2009 +0100
    14.2 +++ b/m4/lx_check_glpk.m4	Tue Apr 28 13:51:34 2009 +0100
    14.3 @@ -64,11 +64,11 @@
    14.4      LIBS="$lx_save_libs"
    14.5  
    14.6      if test x"$lx_glpk_found" = x"yes"; then
    14.7 -      AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
    14.8 +      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
    14.9        lx_lp_found=yes
   14.10 -      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   14.11 +      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   14.12        lx_mip_found=yes
   14.13 -      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
   14.14 +      AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
   14.15        AC_MSG_RESULT([yes])
   14.16      else
   14.17        GLPK_CFLAGS=""
    15.1 --- a/m4/lx_check_soplex.m4	Sun Apr 26 16:36:23 2009 +0100
    15.2 +++ b/m4/lx_check_soplex.m4	Tue Apr 28 13:51:34 2009 +0100
    15.3 @@ -55,9 +55,9 @@
    15.4      LIBS="$lx_save_libs"
    15.5  
    15.6      if test x"$lx_soplex_found" = x"yes"; then
    15.7 -      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
    15.8 +      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
    15.9        lx_lp_found=yes
   15.10 -      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   15.11 +      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
   15.12        AC_MSG_RESULT([yes])
   15.13      else
   15.14        SOPLEX_CXXFLAGS=""
    16.1 --- a/test/CMakeLists.txt	Sun Apr 26 16:36:23 2009 +0100
    16.2 +++ b/test/CMakeLists.txt	Tue Apr 28 13:51:34 2009 +0100
    16.3 @@ -36,22 +36,22 @@
    16.4    time_measure_test
    16.5    unionfind_test)
    16.6  
    16.7 -IF(HAVE_LP)
    16.8 +IF(LEMON_HAVE_LP)
    16.9    ADD_EXECUTABLE(lp_test lp_test.cc)
   16.10    SET(LP_TEST_LIBS lemon)
   16.11 -  IF(HAVE_GLPK)
   16.12 +  IF(LEMON_HAVE_GLPK)
   16.13      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
   16.14 -  ENDIF(HAVE_GLPK)
   16.15 -  IF(HAVE_CPLEX)
   16.16 +  ENDIF(LEMON_HAVE_GLPK)
   16.17 +  IF(LEMON_HAVE_CPLEX)
   16.18      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
   16.19 -  ENDIF(HAVE_CPLEX)
   16.20 -  IF(HAVE_CLP)
   16.21 +  ENDIF(LEMON_HAVE_CPLEX)
   16.22 +  IF(LEMON_HAVE_CLP)
   16.23      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
   16.24 -  ENDIF(HAVE_CLP)
   16.25 +  ENDIF(LEMON_HAVE_CLP)
   16.26    TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
   16.27    ADD_TEST(lp_test lp_test)
   16.28  
   16.29 -  IF(WIN32 AND HAVE_GLPK)
   16.30 +  IF(WIN32 AND LEMON_HAVE_GLPK)
   16.31      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
   16.32      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
   16.33      ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
   16.34 @@ -59,32 +59,32 @@
   16.35        COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
   16.36        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
   16.37      )
   16.38 -  ENDIF(WIN32 AND HAVE_GLPK)
   16.39 -  IF(WIN32 AND HAVE_CPLEX)
   16.40 +  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
   16.41 +  IF(WIN32 AND LEMON_HAVE_CPLEX)
   16.42      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
   16.43      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
   16.44      ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
   16.45        COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
   16.46      )
   16.47 -  ENDIF(WIN32 AND HAVE_CPLEX)
   16.48 -ENDIF(HAVE_LP)
   16.49 +  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
   16.50 +ENDIF(LEMON_HAVE_LP)
   16.51  
   16.52 -IF(HAVE_MIP)
   16.53 +IF(LEMON_HAVE_MIP)
   16.54    ADD_EXECUTABLE(mip_test mip_test.cc)
   16.55    SET(MIP_TEST_LIBS lemon)
   16.56 -  IF(HAVE_GLPK)
   16.57 +  IF(LEMON_HAVE_GLPK)
   16.58      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
   16.59 -  ENDIF(HAVE_GLPK)
   16.60 -  IF(HAVE_CPLEX)
   16.61 +  ENDIF(LEMON_HAVE_GLPK)
   16.62 +  IF(LEMON_HAVE_CPLEX)
   16.63      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
   16.64 -  ENDIF(HAVE_CPLEX)
   16.65 -  IF(HAVE_CBC)
   16.66 +  ENDIF(LEMON_HAVE_CPLEX)
   16.67 +  IF(LEMON_HAVE_CBC)
   16.68      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
   16.69 -  ENDIF(HAVE_CBC)
   16.70 +  ENDIF(LEMON_HAVE_CBC)
   16.71    TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
   16.72    ADD_TEST(mip_test mip_test)
   16.73  
   16.74 -  IF(WIN32 AND HAVE_GLPK)
   16.75 +  IF(WIN32 AND LEMON_HAVE_GLPK)
   16.76      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
   16.77      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
   16.78      ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
   16.79 @@ -92,15 +92,15 @@
   16.80        COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
   16.81        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
   16.82      )
   16.83 -  ENDIF(WIN32 AND HAVE_GLPK)
   16.84 -  IF(WIN32 AND HAVE_CPLEX)
   16.85 +  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
   16.86 +  IF(WIN32 AND LEMON_HAVE_CPLEX)
   16.87      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
   16.88      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
   16.89      ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
   16.90        COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
   16.91      )
   16.92 -  ENDIF(WIN32 AND HAVE_CPLEX)
   16.93 -ENDIF(HAVE_MIP)
   16.94 +  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
   16.95 +ENDIF(LEMON_HAVE_MIP)
   16.96  
   16.97  FOREACH(TEST_NAME ${TESTS})
   16.98    ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
    17.1 --- a/test/lp_test.cc	Sun Apr 26 16:36:23 2009 +0100
    17.2 +++ b/test/lp_test.cc	Tue Apr 28 13:51:34 2009 +0100
    17.3 @@ -25,19 +25,19 @@
    17.4  #include <lemon/config.h>
    17.5  #endif
    17.6  
    17.7 -#ifdef HAVE_GLPK
    17.8 +#ifdef LEMON_HAVE_GLPK
    17.9  #include <lemon/glpk.h>
   17.10  #endif
   17.11  
   17.12 -#ifdef HAVE_CPLEX
   17.13 +#ifdef LEMON_HAVE_CPLEX
   17.14  #include <lemon/cplex.h>
   17.15  #endif
   17.16  
   17.17 -#ifdef HAVE_SOPLEX
   17.18 +#ifdef LEMON_HAVE_SOPLEX
   17.19  #include <lemon/soplex.h>
   17.20  #endif
   17.21  
   17.22 -#ifdef HAVE_CLP
   17.23 +#ifdef LEMON_HAVE_CLP
   17.24  #include <lemon/clp.h>
   17.25  #endif
   17.26  
   17.27 @@ -379,7 +379,7 @@
   17.28    LpSkeleton lp_skel;
   17.29    lpTest(lp_skel);
   17.30  
   17.31 -#ifdef HAVE_GLPK
   17.32 +#ifdef LEMON_HAVE_GLPK
   17.33    {
   17.34      GlpkLp lp_glpk1,lp_glpk2;
   17.35      lpTest(lp_glpk1);
   17.36 @@ -388,7 +388,7 @@
   17.37    }
   17.38  #endif
   17.39  
   17.40 -#ifdef HAVE_CPLEX
   17.41 +#ifdef LEMON_HAVE_CPLEX
   17.42    try {
   17.43      CplexLp lp_cplex1,lp_cplex2;
   17.44      lpTest(lp_cplex1);
   17.45 @@ -399,7 +399,7 @@
   17.46    }
   17.47  #endif
   17.48  
   17.49 -#ifdef HAVE_SOPLEX
   17.50 +#ifdef LEMON_HAVE_SOPLEX
   17.51    {
   17.52      SoplexLp lp_soplex1,lp_soplex2;
   17.53      lpTest(lp_soplex1);
   17.54 @@ -408,7 +408,7 @@
   17.55    }
   17.56  #endif
   17.57  
   17.58 -#ifdef HAVE_CLP
   17.59 +#ifdef LEMON_HAVE_CLP
   17.60    {
   17.61      ClpLp lp_clp1,lp_clp2;
   17.62      lpTest(lp_clp1);
    18.1 --- a/test/mip_test.cc	Sun Apr 26 16:36:23 2009 +0100
    18.2 +++ b/test/mip_test.cc	Tue Apr 28 13:51:34 2009 +0100
    18.3 @@ -22,15 +22,15 @@
    18.4  #include <lemon/config.h>
    18.5  #endif
    18.6  
    18.7 -#ifdef HAVE_CPLEX
    18.8 +#ifdef LEMON_HAVE_CPLEX
    18.9  #include <lemon/cplex.h>
   18.10  #endif
   18.11  
   18.12 -#ifdef HAVE_GLPK
   18.13 +#ifdef LEMON_HAVE_GLPK
   18.14  #include <lemon/glpk.h>
   18.15  #endif
   18.16  
   18.17 -#ifdef HAVE_CBC
   18.18 +#ifdef LEMON_HAVE_CBC
   18.19  #include <lemon/cbc.h>
   18.20  #endif
   18.21  
   18.22 @@ -129,7 +129,7 @@
   18.23  int main()
   18.24  {
   18.25  
   18.26 -#ifdef HAVE_GLPK
   18.27 +#ifdef LEMON_HAVE_GLPK
   18.28    {
   18.29      GlpkMip mip1;
   18.30      aTest(mip1);
   18.31 @@ -137,7 +137,7 @@
   18.32    }
   18.33  #endif
   18.34  
   18.35 -#ifdef HAVE_CPLEX
   18.36 +#ifdef LEMON_HAVE_CPLEX
   18.37    try {
   18.38      CplexMip mip2;
   18.39      aTest(mip2);
   18.40 @@ -147,7 +147,7 @@
   18.41    }
   18.42  #endif
   18.43  
   18.44 -#ifdef HAVE_CBC
   18.45 +#ifdef LEMON_HAVE_CBC
   18.46    {
   18.47      CbcMip mip1;
   18.48      aTest(mip1);
    19.1 --- a/tools/dimacs-solver.cc	Sun Apr 26 16:36:23 2009 +0100
    19.2 +++ b/tools/dimacs-solver.cc	Tue Apr 28 13:51:34 2009 +0100
    19.3 @@ -200,7 +200,7 @@
    19.4      .boolOption("q", "Do not print any report")
    19.5      .boolOption("int","Use 'int' for capacities, costs etc. (default)")
    19.6      .optionGroup("datatype","int")
    19.7 -#ifdef HAVE_LONG_LONG
    19.8 +#ifdef LEMON_HAVE_LONG_LONG
    19.9      .boolOption("long","Use 'long long' for capacities, costs etc.")
   19.10      .optionGroup("datatype","long")
   19.11  #endif
   19.12 @@ -267,7 +267,7 @@
   19.13      solve<double>(ap,is,os,desc);
   19.14    else if(ap.given("ldouble"))
   19.15      solve<long double>(ap,is,os,desc);
   19.16 -#ifdef HAVE_LONG_LONG
   19.17 +#ifdef LEMON_HAVE_LONG_LONG
   19.18    else if(ap.given("long"))
   19.19      solve<long long>(ap,is,os,desc);
   19.20  #endif