From 57c636c02784f909e4b5d3c2f0ecbdbb47097266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 4 Nov 2021 01:20:16 +0000 Subject: [PATCH] cmake: Fix incorrect relative-path concatenation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a `-DCMAKE_INSTALL_PREFIX` is given, this could result in paths like: /path/to/prefix//path/to/prefix/lib/cmake/glog/glog-modules.cmake which was incorrect. If a relative DESTINATION is given, it's assumed to be relative to the install prefix. Signed-off-by: Niklas Hambüchen --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62ebbccb1..5cb37f4e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -868,7 +868,7 @@ configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\" file (INSTALL \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" DESTINATION - \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\") + \"${_glog_CMake_INSTALLDIR}\") " COMPONENT Development )