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:40 (GMT) |
| commit | 26c6d554e058f39ccc45f25fe9e6fda53cd8f169 (patch) | |
| tree | 50d9172894cdd2aa1666c7be770c9cd40559536b /Modules | |
| parent | 1191f642c02cf3e9cd23a27f8a4b19b2c5065b19 (diff) | |
| parent | 61436858e431b137252b3d5e63ee579c7c575103 (diff) | |
| download | CMake-26c6d554e058f39ccc45f25fe9e6fda53cd8f169.zip CMake-26c6d554e058f39ccc45f25fe9e6fda53cd8f169.tar.gz CMake-26c6d554e058f39ccc45f25fe9e6fda53cd8f169.tar.bz2 | |
Merge topic 'UsePkgConfig-trailing-whitespace'
61436858e4 UsePkgConfig: Restore removal of trailing whitespace from pkg-config output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9094
Diffstat (limited to 'Modules')
| -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() |