diff -up kdeedu-4.2.0/cmake/modules/FindINDI.cmake.nodrivers kdeedu-4.2.0/cmake/modules/FindINDI.cmake --- kdeedu-4.2.0/cmake/modules/FindINDI.cmake.nodrivers 2008-10-30 09:14:46.000000000 -0500 +++ kdeedu-4.2.0/cmake/modules/FindINDI.cmake 2009-02-09 13:57:44.000000000 -0600 @@ -11,14 +11,14 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES) +if (INDI_INCLUDE_DIR AND INDI_LIBRARIES) # in cache already set(INDI_FOUND TRUE) message(STATUS "Found INDI: ${INDI_LIBRARIES}") -else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES) +else (INDI_INCLUDE_DIR AND INDI_LIBRARIES) find_path(INDI_INCLUDE_DIR indidevapi.h PATH_SUFFIXES libindi @@ -26,28 +26,22 @@ else (INDI_INCLUDE_DIR AND INDI_LIBRARIE ${GNUWIN32_DIR}/include ) - find_library(INDI_DRIVER_LIBRARIES NAMES indidriver - PATHS - ${_obLinkDir} - ${GNUWIN32_DIR}/lib - ) - find_library(INDI_LIBRARIES NAMES indi PATHS ${_obLinkDir} ${GNUWIN32_DIR}/lib ) - if(INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES) + if(INDI_INCLUDE_DIR AND INDI_LIBRARIES) set(INDI_FOUND TRUE) - else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES) + else (INDI_INCLUDE_DIR AND INDI_LIBRARIES) set(INDI_FOUND FALSE) - endif(INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES) + endif(INDI_INCLUDE_DIR AND INDI_LIBRARIES) if (INDI_FOUND) if (NOT INDI_FIND_QUIETLY) - message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_DRIVER_LIBRARIES}") + message(STATUS "Found INDI: ${INDI_LIBRARIES}") endif (NOT INDI_FIND_QUIETLY) else (INDI_FOUND) if (INDI_FIND_REQUIRED) @@ -55,6 +49,6 @@ else (INDI_INCLUDE_DIR AND INDI_LIBRARIE endif (INDI_FIND_REQUIRED) endif (INDI_FOUND) - mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_DRIVER_LIBRARIES) + mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES) -endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES) +endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES)