diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-20 14:03:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-20 14:03:38 (GMT) |
| commit | 158316dc0c0fb856feb67ca3cacd7681170b5e0a (patch) | |
| tree | 70920c032aac910757a16f10d8145109e3f20628 | |
| parent | e9a3f3fb029c0e52e30a84c61206fa8c71807b47 (diff) | |
| parent | 61436858e431b137252b3d5e63ee579c7c575103 (diff) | |
| download | CMake-158316dc0c0fb856feb67ca3cacd7681170b5e0a.zip CMake-158316dc0c0fb856feb67ca3cacd7681170b5e0a.tar.gz CMake-158316dc0c0fb856feb67ca3cacd7681170b5e0a.tar.bz2 | |
Merge topic 'UsePkgConfig-trailing-whitespace' into release-3.28
61436858e4 UsePkgConfig: Restore removal of trailing whitespace from pkg-config output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9094
| -rw-r--r-- | Modules/UsePkgConfig.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Modules/UsePkgConfig.cmake b/Modules/UsePkgConfig.cmake index b020259..fdf632a 100644 --- a/Modules/UsePkgConfig.cmake +++ b/Modules/UsePkgConfig.cmake @@ -41,20 +41,19 @@ macro(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags) if(NOT _return_VALUE) execute_process(COMMAND ${PKGCONFIG_EXECUTABLE} ${_package} --variable=includedir - OUTPUT_VARIABLE ${_include_DIR} ) + OUTPUT_VARIABLE ${_include_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE ) string(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}") - execute_process(COMMAND ${PKGCONFIG_EXECUTABLE} ${_package} --variable=libdir - OUTPUT_VARIABLE ${_link_DIR} ) + OUTPUT_VARIABLE ${_link_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE ) string(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}") execute_process(COMMAND ${PKGCONFIG_EXECUTABLE} ${_package} --libs - OUTPUT_VARIABLE ${_link_FLAGS} ) + OUTPUT_VARIABLE ${_link_FLAGS} OUTPUT_STRIP_TRAILING_WHITESPACE ) string(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}") execute_process(COMMAND ${PKGCONFIG_EXECUTABLE} ${_package} --cflags - OUTPUT_VARIABLE ${_cflags} ) + OUTPUT_VARIABLE ${_cflags} OUTPUT_STRIP_TRAILING_WHITESPACE ) string(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}") else() |