1.1 --- a/test/CMakeLists.txt	Tue Jan 20 12:23:14 2009 +0000
     1.2 +++ b/test/CMakeLists.txt	Wed Jan 21 18:08:31 2009 +0000
     1.3 @@ -1,9 +1,12 @@
     1.4  INCLUDE_DIRECTORIES(
     1.5    ${CMAKE_SOURCE_DIR}
     1.6    ${CMAKE_BINARY_DIR}
     1.7 -  ${GLPK_INCLUDE_DIR}
     1.8  )
     1.9  
    1.10 +IF(HAVE_GLPK)
    1.11 +  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
    1.12 +ENDIF(HAVE_GLPK)
    1.13 +
    1.14  LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
    1.15  
    1.16  SET(TESTS
    1.17 @@ -35,10 +38,12 @@
    1.18  
    1.19  IF(HAVE_LP)
    1.20    ADD_EXECUTABLE(lp_test lp_test.cc)
    1.21 -  TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})
    1.22 +  IF(HAVE_GLPK)
    1.23 +    TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})
    1.24 +  ENDIF(HAVE_GLPK)
    1.25    ADD_TEST(lp_test lp_test)
    1.26  
    1.27 -  IF(WIN32)
    1.28 +  IF(WIN32 AND HAVE_GLPK)
    1.29      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    1.30      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.31      ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    1.32 @@ -46,15 +51,17 @@
    1.33        COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    1.34        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.35      )
    1.36 -  ENDIF(WIN32)
    1.37 +  ENDIF(WIN32 AND HAVE_GLPK)
    1.38  ENDIF(HAVE_LP)
    1.39  
    1.40  IF(HAVE_MIP)
    1.41    ADD_EXECUTABLE(mip_test mip_test.cc)
    1.42 -  TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})
    1.43 +  IF(HAVE_GLPK)
    1.44 +    TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})
    1.45 +  ENDIF(HAVE_GLPK)
    1.46    ADD_TEST(mip_test mip_test)
    1.47  
    1.48 -  IF(WIN32)
    1.49 +  IF(WIN32 AND HAVE_GLPK)
    1.50      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    1.51      GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    1.52      ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    1.53 @@ -62,7 +69,7 @@
    1.54        COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    1.55        COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    1.56      )
    1.57 -  ENDIF(WIN32)
    1.58 +  ENDIF(WIN32 AND HAVE_GLPK)
    1.59  ENDIF(HAVE_MIP)
    1.60  
    1.61  FOREACH(TEST_NAME ${TESTS})