diff -r f3792d5bb294 -r 8d289c89d43e test/CMakeLists.txt --- a/test/CMakeLists.txt Wed Apr 29 17:48:18 2009 +0100 +++ b/test/CMakeLists.txt Wed Apr 29 17:48:41 2009 +0100 @@ -36,22 +36,22 @@ time_measure_test unionfind_test) -IF(HAVE_LP) +IF(LEMON_HAVE_LP) ADD_EXECUTABLE(lp_test lp_test.cc) SET(LP_TEST_LIBS lemon) - IF(HAVE_GLPK) + IF(LEMON_HAVE_GLPK) SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES}) - ENDIF(HAVE_GLPK) - IF(HAVE_CPLEX) + ENDIF(LEMON_HAVE_GLPK) + IF(LEMON_HAVE_CPLEX) SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES}) - ENDIF(HAVE_CPLEX) - IF(HAVE_CLP) + ENDIF(LEMON_HAVE_CPLEX) + IF(LEMON_HAVE_CLP) SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES}) - ENDIF(HAVE_CLP) + ENDIF(LEMON_HAVE_CLP) TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS}) ADD_TEST(lp_test lp_test) - IF(WIN32 AND HAVE_GLPK) + IF(WIN32 AND LEMON_HAVE_GLPK) GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD @@ -59,32 +59,32 @@ COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH} COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} ) - ENDIF(WIN32 AND HAVE_GLPK) - IF(WIN32 AND HAVE_CPLEX) + ENDIF(WIN32 AND LEMON_HAVE_GLPK) + IF(WIN32 AND LEMON_HAVE_CPLEX) GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} ) - ENDIF(WIN32 AND HAVE_CPLEX) -ENDIF(HAVE_LP) + ENDIF(WIN32 AND LEMON_HAVE_CPLEX) +ENDIF(LEMON_HAVE_LP) -IF(HAVE_MIP) +IF(LEMON_HAVE_MIP) ADD_EXECUTABLE(mip_test mip_test.cc) SET(MIP_TEST_LIBS lemon) - IF(HAVE_GLPK) + IF(LEMON_HAVE_GLPK) SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES}) - ENDIF(HAVE_GLPK) - IF(HAVE_CPLEX) + ENDIF(LEMON_HAVE_GLPK) + IF(LEMON_HAVE_CPLEX) SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES}) - ENDIF(HAVE_CPLEX) - IF(HAVE_CBC) + ENDIF(LEMON_HAVE_CPLEX) + IF(LEMON_HAVE_CBC) SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES}) - ENDIF(HAVE_CBC) + ENDIF(LEMON_HAVE_CBC) TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS}) ADD_TEST(mip_test mip_test) - IF(WIN32 AND HAVE_GLPK) + IF(WIN32 AND LEMON_HAVE_GLPK) GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD @@ -92,15 +92,15 @@ COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH} COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} ) - ENDIF(WIN32 AND HAVE_GLPK) - IF(WIN32 AND HAVE_CPLEX) + ENDIF(WIN32 AND LEMON_HAVE_GLPK) + IF(WIN32 AND LEMON_HAVE_CPLEX) GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} ) - ENDIF(WIN32 AND HAVE_CPLEX) -ENDIF(HAVE_MIP) + ENDIF(WIN32 AND LEMON_HAVE_CPLEX) +ENDIF(LEMON_HAVE_MIP) FOREACH(TEST_NAME ${TESTS}) ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)