From 471a5dc18b4465b051cddf4e02dbdf44336f80ce Mon Sep 17 00:00:00 2001 From: Stefan Hacker Date: Sun, 14 Jan 2018 13:38:20 +0100 Subject: Fix cmake export for grpc This patch fixes two issues with the targets exported by the grpc cmake build: - Install directories are now given relative instead of absolute. Previously the exported targets would contain absolute paths to their created targets when they should be relative. The actual installation location stays the same as cmake automatically interprets the paths relative to CMAKE_INSTALL_PREFIX - ZLIB and OpenSSL are now linked using targets instead of the legacy library variables if possible. Using the legacy paths produces absolute paths to those dependencies in the export. With this change cmake inserts the target names instead. With these changes no more absolute paths are inserted into the export allowing the install location to be used as an artifact that can be moved or transfered to another machine and used there. --- templates/CMakeLists.txt.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/CMakeLists.txt.template') diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 8de0ccde82..8bd62dca43 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -74,10 +74,10 @@ set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") project(<%text>${PACKAGE_NAME} C CXX) - set(gRPC_INSTALL_BINDIR "<%text>${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") - set(gRPC_INSTALL_LIBDIR "<%text>${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") - set(gRPC_INSTALL_INCLUDEDIR "<%text>${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") - set(gRPC_INSTALL_CMAKEDIR "<%text>${CMAKE_INSTALL_PREFIX}/lib/cmake/${PACKAGE_NAME}" CACHE PATH "Installation directory for cmake config files") + set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") + set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") + set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") + set(gRPC_INSTALL_CMAKEDIR "lib/cmake/<%text>${PACKAGE_NAME}" CACHE STRING "Installation directory for cmake config files") # Options option(gRPC_BUILD_TESTS "Build tests" OFF) -- cgit v1.2.3