mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-06 04:03:27 +03:00
UsePkgConfig: Restore removal of trailing whitespace from pkg-config output
Since commit f73a5bfaa9 (UsePkgConfig: Replace exec_program() with
execute_process(), 2023-07-24, v3.28.0-rc1~321^2~6), trailing whitespace
was introduced into libraries linked, which violates CMP0004.
This commit is contained in:
1 parent
e9a3f3fb02
commit
61436858e4
1 file changed
+4
-5
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user