1.1 --- a/test/CMakeLists.txt	Sun Apr 26 16:36:23 2009 +0100
     1.2 +++ b/test/CMakeLists.txt	Tue Apr 28 13:51:34 2009 +0100
     1.3 @@ -36,22 +36,22 @@
     1.4    time_measure_test
     1.5    unionfind_test)
     1.6  
     1.7 -IF(HAVE_LP)
     1.8 +IF(LEMON_HAVE_LP)
     1.9    ADD_EXECUTABLE(lp_test lp_test.cc)
    1.10    SET(LP_TEST_LIBS lemon)
    1.11 -  IF(HAVE_GLPK)
    1.12 +  IF(LEMON_HAVE_GLPK)
    1.13      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
    1.14 -  ENDIF(HAVE_GLPK)
    1.15 -  IF(HAVE_CPLEX)
    1.16 +  ENDIF(LEMON_HAVE_GLPK)
    1.17 +  IF(LEMON_HAVE_CPLEX)
    1.18      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
    1.19 -  ENDIF(HAVE_CPLEX)
    1.20 -  IF(HAVE_CLP)
    1.21 +  ENDIF(LEMON_HAVE_CPLEX)
    1.22 +  IF(LEMON_HAVE_CLP)
    1.23      SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
    1.24 -  ENDIF(HAVE_CLP)
    1.25 +  ENDIF(LEMON_HAVE_CLP)
    1.26    TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
    1.27    ADD_TEST(lp_test lp_test)
    1.28  
    1.29 -  IF(WIN32 AND HAVE_GLPK)
    1.30 +  IF(WIN32 AND LEMON_HAVE_GLPK)
    1.31      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    1.32      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.33      ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    1.34 @@ -59,32 +59,32 @@
    1.35        COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    1.36        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.37      )
    1.38 -  ENDIF(WIN32 AND HAVE_GLPK)
    1.39 -  IF(WIN32 AND HAVE_CPLEX)
    1.40 +  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
    1.41 +  IF(WIN32 AND LEMON_HAVE_CPLEX)
    1.42      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    1.43      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.44      ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    1.45        COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    1.46      )
    1.47 -  ENDIF(WIN32 AND HAVE_CPLEX)
    1.48 -ENDIF(HAVE_LP)
    1.49 +  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
    1.50 +ENDIF(LEMON_HAVE_LP)
    1.51  
    1.52 -IF(HAVE_MIP)
    1.53 +IF(LEMON_HAVE_MIP)
    1.54    ADD_EXECUTABLE(mip_test mip_test.cc)
    1.55    SET(MIP_TEST_LIBS lemon)
    1.56 -  IF(HAVE_GLPK)
    1.57 +  IF(LEMON_HAVE_GLPK)
    1.58      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
    1.59 -  ENDIF(HAVE_GLPK)
    1.60 -  IF(HAVE_CPLEX)
    1.61 +  ENDIF(LEMON_HAVE_GLPK)
    1.62 +  IF(LEMON_HAVE_CPLEX)
    1.63      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
    1.64 -  ENDIF(HAVE_CPLEX)
    1.65 -  IF(HAVE_CBC)
    1.66 +  ENDIF(LEMON_HAVE_CPLEX)
    1.67 +  IF(LEMON_HAVE_CBC)
    1.68      SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
    1.69 -  ENDIF(HAVE_CBC)
    1.70 +  ENDIF(LEMON_HAVE_CBC)
    1.71    TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
    1.72    ADD_TEST(mip_test mip_test)
    1.73  
    1.74 -  IF(WIN32 AND HAVE_GLPK)
    1.75 +  IF(WIN32 AND LEMON_HAVE_GLPK)
    1.76      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    1.77      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.78      ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    1.79 @@ -92,15 +92,15 @@
    1.80        COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    1.81        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.82      )
    1.83 -  ENDIF(WIN32 AND HAVE_GLPK)
    1.84 -  IF(WIN32 AND HAVE_CPLEX)
    1.85 +  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
    1.86 +  IF(WIN32 AND LEMON_HAVE_CPLEX)
    1.87      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    1.88      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.89      ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    1.90        COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    1.91      )
    1.92 -  ENDIF(WIN32 AND HAVE_CPLEX)
    1.93 -ENDIF(HAVE_MIP)
    1.94 +  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
    1.95 +ENDIF(LEMON_HAVE_MIP)
    1.96  
    1.97  FOREACH(TEST_NAME ${TESTS})
    1.98    ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)