diff options
author | Dakota Hawkins <dakotahawkins@gmail.com> | 2018-07-24 15:06:55 (GMT) |
---|---|---|
committer | Dakota Hawkins <dakotahawkins@gmail.com> | 2018-08-21 17:02:09 (GMT) |
commit | 759ef7c4e9662321548d1c30528c78ecdba2a05d (patch) | |
tree | 8123065767fdd8d9241804f032632573a2522bba /googletest | |
parent | b88511ef640c046ec9c7553b383a2aba64c80967 (diff) | |
download | googletest-759ef7c4e9662321548d1c30528c78ecdba2a05d.zip googletest-759ef7c4e9662321548d1c30528c78ecdba2a05d.tar.gz googletest-759ef7c4e9662321548d1c30528c78ecdba2a05d.tar.bz2 |
Improve CMake exported targets.refs/pull/1682/head
I _think_ this represents some of the "best practices" for exporting
targets. They'll be available in a `googletest::` namespace (e.g.
`googletest::gmock`) with non-namespaced `ALIAS` targets.
- Added GOOGLETEST_VERSION variable
- Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8
Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
Diffstat (limited to 'googletest')
-rw-r--r-- | googletest/CMakeLists.txt | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 2c735f6..3ab964f 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -44,7 +44,7 @@ if (CMAKE_VERSION VERSION_LESS 3.0) project(gtest CXX C) else() cmake_policy(SET CMP0048 NEW) - project(gtest VERSION 1.9.0 LANGUAGES CXX C) + project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) endif() cmake_minimum_required(VERSION 2.6.4) @@ -118,18 +118,41 @@ target_link_libraries(gtest_main gtest) # to the targets for when we are part of a parent build (ie being pulled # in via add_subdirectory() rather than being a standalone build). if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") - target_include_directories(gtest_main SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") + target_include_directories(gtest SYSTEM + INTERFACE + $<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include> + $<BUILD_INTERFACE:${gtest_SOURCE_DIR}> + $<INSTALL_INTERFACE:include>) + target_include_directories(gtest_main SYSTEM + INTERFACE + $<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include> + $<BUILD_INTERFACE:${gtest_SOURCE_DIR}> + $<INSTALL_INTERFACE:include>) endif() ######################################################################## # # Install rules if(INSTALL_GTEST) - install(TARGETS gtest gtest_main + install(TARGETS gtest + EXPORT gtestConfigInternal RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(EXPORT gtestConfigInternal + DESTINATION "${INSTALL_CMAKE_DIR}" + NAMESPACE googletest_) + install(TARGETS gtest_main + EXPORT gtest_mainConfigInternal + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(EXPORT gtest_mainConfigInternal + DESTINATION "${INSTALL_CMAKE_DIR}" + NAMESPACE googletest_) + set(googletest_install_targets + ${googletest_install_targets} gtest gtest_main PARENT_SCOPE) + install(DIRECTORY "${gtest_SOURCE_DIR}/include/gtest" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") |