projects / packages / elektra.git / blame
| Commit | Line | Data |
|---|---|---|
| e86f7c76 JB |
1 | Avoid: |
| 2 | CMake Error in src/plugins/gpgme/CMakeLists.txt: | |
| 3 | Found relative path while evaluating include directories of | |
| 4 | "elektra-gpgme-objects": | |
| 5 | ||
| 6 | "-D_FILE_OFFSET_BITS=64" | |
| 7 | ||
| 8 | --- elektra-0.8.26/cmake/Modules/FindLibGpgme.cmake.orig 2019-02-26 12:45:46.000000000 +0100 | |
| 9 | +++ elektra-0.8.26/cmake/Modules/FindLibGpgme.cmake 2022-07-03 17:45:45.536033437 +0200 | |
| 10 | @@ -52,10 +52,13 @@ if (LIBGPGME_FOUND) | |
| 11 | string (LENGTH "${LIBGPGME_CFLAGS}" | |
| 12 | LIBGPGME_CFLAGS_LEN) | |
| 13 | if (${LIBGPGME_CFLAGS_LEN} GREATER 1) | |
| 14 | + string (REGEX REPLACE "-D[A-Za-z0-9_=]* *" "" | |
| 15 | + LIBGPGME_INCLUDE_DIRS | |
| 16 | + "${LIBGPGME_CFLAGS}") | |
| 17 | string (REPLACE "-I" | |
| 18 | "" | |
| 19 | LIBGPGME_INCLUDE_DIRS | |
| 20 | - "${LIBGPGME_CFLAGS}") | |
| 21 | + "${LIBGPGME_INCLUDE_DIRS}") | |
| 22 | string (REPLACE " " | |
| 23 | ";" | |
| 24 | LIBGPGME_INCLUDE_DIRS | |
| 25 | --- elektra-0.8.26/src/plugins/gpgme/CMakeLists.txt.orig 2019-02-26 12:45:46.000000000 +0100 | |
| 26 | +++ elektra-0.8.26/src/plugins/gpgme/CMakeLists.txt 2022-07-03 18:16:30.609371151 +0200 | |
| 27 | @@ -11,4 +11,4 @@ endif () | |
| 28 | ||
| 29 | set (GPGME_SOURCE_FILES keylist.h keylist.c gpgme.h gpgme.c) | |
| 30 | ||
| 31 | -add_plugin (gpgme SOURCES ${GPGME_SOURCE_FILES} INCLUDE_DIRECTORIES ${LIBGPGME_INCLUDE_DIRS} LINK_LIBRARIES ${LIBGPGME_LIBRARIES} ADD_TEST) | |
| 32 | +add_plugin (gpgme SOURCES ${GPGME_SOURCE_FILES} INCLUDE_DIRECTORIES ${LIBGPGME_INCLUDE_DIRS} LINK_LIBRARIES ${LIBGPGME_LIBRARIES} COMPILE_DEFINITIONS "_FILE_OFFSET_BITS=64" ADD_TEST) |