File 0001-Fix-configure_file-for-protobuf-.cmake.patch of Package clickhouse

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-configure_file-for-protobuf-.cmake.patch of Package clickhouse (Revision 1a4e92b8a1c3459e2a4493a5d1a68a31)

Currently displaying revision 1a4e92b8a1c3459e2a4493a5d1a68a31 , Show latest

From 4742ac3284fa9b184d5ac8fafade4e69bb95cc2f Mon Sep 17 00:00:00 2001
From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
Date: Tue, 17 Dec 2019 20:00:38 +0300
Subject: [PATCH] Fix configure_file for protobuf-*.cmake

configure_file is executed at configuration time.
If CMAKE_INSTALL_LIBDIR happens to be absolute path then the superuser
permissions are required at configuration time to create *.cmake files.
---
 cmake/install.cmake | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/protobuf/cmake/install.cmake b/contrib/protobuf/cmake/install.cmake
index 82036cb..85e89f9 100644
--- a/contrib/protobuf/cmake/install.cmake
+++ b/contrib/protobuf/cmake/install.cmake
@@ -96,13 +96,13 @@ endif()
 mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
 
 configure_file(protobuf-config.cmake.in
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-config.cmake @ONLY)
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-config.cmake @ONLY)
 configure_file(protobuf-config-version.cmake.in
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-config-version.cmake @ONLY)
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-config-version.cmake @ONLY)
 configure_file(protobuf-module.cmake.in
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-module.cmake @ONLY)
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-module.cmake @ONLY)
 configure_file(protobuf-options.cmake
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-options.cmake @ONLY)
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-options.cmake @ONLY)
 
 # Allows the build directory to be used as a find directory.
 
@@ -129,6 +129,13 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CMAKEDIR}/
   PATTERN protobuf-targets.cmake EXCLUDE
 )
 
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-config.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-config-version.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-module.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/protobuf-options.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
 option(protobuf_INSTALL_EXAMPLES "Install the examples folder" OFF)
 if(protobuf_INSTALL_EXAMPLES)
   install(DIRECTORY ../examples/ DESTINATION examples
-- 
2.16.4

Places

File 0001-Fix-configure_file-for-protobuf-.cmake.patch of Package clickhouse (Revision 1a4e92b8a1c3459e2a4493a5d1a68a31)

Places