diff options
| author | Laurent Montel <montel@kde.org> | 2007-06-21 06:48:05 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2007-06-21 06:48:05 +0000 |
| commit | 61309356b69c450a46e00281e5e916ef8332e302 (patch) | |
| tree | c5c2e84d8474d056da1f85f39026714dc44e9b0c | |
| parent | b742c4183e643088dda6777add2d49334fe52a5f (diff) | |
| download | extra-cmake-modules-61309356b69c450a46e00281e5e916ef8332e302.tar.gz extra-cmake-modules-61309356b69c450a46e00281e5e916ef8332e302.tar.bz2 | |
Fix pb to search include with gphoto2
svn path=/trunk/KDE/kdelibs/; revision=678365
| -rw-r--r-- | modules/FindGphoto2.cmake | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/modules/FindGphoto2.cmake b/modules/FindGphoto2.cmake index 5a0ce432..6f966c02 100644 --- a/modules/FindGphoto2.cmake +++ b/modules/FindGphoto2.cmake @@ -32,10 +32,24 @@ if (KDE4_GPHOTO2 ) EXEC_PROGRAM(${GHOTO2PORTCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GPHOTO2PORT_LIBRARY) EXEC_PROGRAM(${GHOTO2CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GPHOTO2_LIBRARY) - EXEC_PROGRAM(${GHOTO2PORTCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GPHOTO2PORT_INCLUDE_DIR) - EXEC_PROGRAM(${GHOTO2CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GPHOTO2_INCLUDE_DIR) + EXEC_PROGRAM(${GHOTO2PORTCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _GPHOTO2PORT_RESULT_INCLUDE_DIR) + EXEC_PROGRAM(${GHOTO2CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _GPHOTO2_RESULT_INCLUDE_DIR) set(GPHOTO2_LIBRARIES ${GPHOTO2PORT_LIBRARY} ${GPHOTO2_LIBRARY}) + # the cflags for poppler-qt4 can contain more than one include path + separate_arguments(_GPHOTO2_RESULT_INCLUDE_DIR) + foreach(_includedir ${_GPHOTO2_RESULT_INCLUDE_DIR}) + string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}") + set(GPHOTO2_INCLUDE_DIR ${GPHOTO2_INCLUDE_DIR} ${_includedir}) + endforeach(_includedir) + separate_arguments(_GPHOTO2PORT_RESULT_INCLUDE_DIR) + foreach(_includedir ${_GPHOTO2PORT_RESULT_INCLUDE_DIR}) + string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}") + set(GPHOTO2PORT_INCLUDE_DIR ${GPHOTO2PORT_INCLUDE_DIR} ${_includedir}) + endforeach(_includedir) + + + set(GPHOTO2_INCLUDE_DIRS ${GPHOTO2PORT_INCLUDE_DIR} ${GPHOTO2_INCLUDE_DIR} ) endif(GHOTO2PORTCONFIG_EXECUTABLE AND GHOTO2CONFIG_EXECUTABLE) |