diff options
| author | David Faure <faure@kde.org> | 2006-04-12 10:36:33 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-04-12 10:36:33 +0000 |
| commit | 387a0c0abdf017075b0369d33a482634af492a04 (patch) | |
| tree | 96a732b6308c4c65826e0abcee6f3eacd768a5f7 | |
| parent | 4959e3f61366c6b027fe4a0f6e4329cbc10d3f9b (diff) | |
| download | extra-cmake-modules-387a0c0abdf017075b0369d33a482634af492a04.tar.gz extra-cmake-modules-387a0c0abdf017075b0369d33a482634af492a04.tar.bz2 | |
Actually use the cache so that every call to cmake doesn't call akode-config.
The same needs to be done in many other checks...
svn path=/trunk/KDE/kdelibs/; revision=528992
| -rw-r--r-- | modules/FindAkode.cmake | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/modules/FindAkode.cmake b/modules/FindAkode.cmake index 47efe871..5c1bab29 100644 --- a/modules/FindAkode.cmake +++ b/modules/FindAkode.cmake @@ -5,28 +5,35 @@ # AKODE_INCLUDE_DIR - the aKode include directory # AKODE_LIBRARIES - The libraries needed to use aKode -FIND_PROGRAM(AKODECONFIG_EXECUTABLE NAMES akode-config PATHS - /usr/bin - /usr/local/bin -) +IF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) -#reset vars -set(AKODE_LIBRARIES) -set(AKODE_INCLUDE_DIR) + # in cache already + SET(AKODE_FOUND TRUE) -# if akode-config has been found -IF (AKODECONFIG_EXECUTABLE) +ELSE (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) - EXEC_PROGRAM(${AKODECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE AKODE_LIBRARIES) + FIND_PROGRAM(AKODECONFIG_EXECUTABLE NAMES akode-config PATHS + /usr/bin + /usr/local/bin + ) - EXEC_PROGRAM(${AKODECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE AKODE_INCLUDE_DIR) + # if akode-config has been found + IF (AKODECONFIG_EXECUTABLE) - IF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) - SET(AKODE_FOUND TRUE) - STRING(REGEX REPLACE "-I(.+)" "\\1" AKODE_INCLUDE_DIR "${AKODE_INCLUDE_DIR}") - message(STATUS "Found aKode: ${AKODE_LIBRARIES}") - ENDIF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) + EXEC_PROGRAM(${AKODECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE AKODE_LIBRARIES) - MARK_AS_ADVANCED(AKODE_INCLUDE_DIR AKODE_LIBRARIES) + EXEC_PROGRAM(${AKODECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE AKODE_INCLUDE_DIR) -ENDIF (AKODECONFIG_EXECUTABLE) + IF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) + SET(AKODE_FOUND TRUE) + STRING(REGEX REPLACE "-I(.+)" "\\1" AKODE_INCLUDE_DIR "${AKODE_INCLUDE_DIR}") + message(STATUS "Found aKode: ${AKODE_LIBRARIES}") + ENDIF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) + + # ensure that they are cached + set(AKODE_INCLUDE_DIR ${AKODE_INCLUDE_DIR} CACHE INTERNAL "The akode include path") + set(AKODE_LIBRARIES ${AKODE_LIBRARIES} CACHE INTERNAL "The libraries needed to use libraries") + + ENDIF (AKODECONFIG_EXECUTABLE) + +ENDIF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) |