diff options
| author | Walter Gray <wgray@leapmotion.com> | 2016-05-19 14:52:04 -0700 |
|---|---|---|
| committer | Walter Gray <wgray@leapmotion.com> | 2016-05-19 14:52:04 -0700 |
| commit | 7d79458fc5d4392f68a08b9f9bef39fc8dcec861 (patch) | |
| tree | 0cc17b5fadb69e95db279a93b4838ab60fb631e4 /cmake/install.cmake | |
| parent | c034ba768f244930a476e484334e69b9a6f26931 (diff) | |
| download | protobuf-7d79458fc5d4392f68a08b9f9bef39fc8dcec861.tar.gz protobuf-7d79458fc5d4392f68a08b9f9bef39fc8dcec861.tar.bz2 protobuf-7d79458fc5d4392f68a08b9f9bef39fc8dcec861.zip | |
Fix the cmake configuration file install path to be more standards compliant (See the description of cmake's config search behavior on https://cmake.org/cmake/help/v3.4/command/find_package.html)
Diffstat (limited to 'cmake/install.cmake')
| -rw-r--r-- | cmake/install.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmake/install.cmake b/cmake/install.cmake index dbb4265d..e0962659 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -83,9 +83,15 @@ foreach(_file ${nobase_dist_proto_DATA}) endforeach() # Export configuration +set(_cmakedir_desc "Directory relative to CMAKE_INSTALL to install the cmake configuration files") +if(NOT MSVC) + set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/protobuf" CACHE STRING "${_cmakedir_desc") +else() + set(CMAKE_INSTALL_CMAKEDIR "cmake" CACHE STRING "${_cmakedir_desc}") +endif() install(EXPORT protobuf-targets - DESTINATION "lib/cmake/protobuf" + DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" COMPONENT protobuf-export) configure_file(protobuf-config.cmake.in @@ -99,5 +105,5 @@ install(FILES "${protobuf_BINARY_DIR}/protobuf-config.cmake" "${protobuf_BINARY_DIR}/protobuf-config-version.cmake" "${protobuf_BINARY_DIR}/protobuf-module.cmake" - DESTINATION "lib/cmake/protobuf" + DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" COMPONENT protobuf-export) |