Chiebot-Mirror
/
googletest
mirror of https://github.com/google/googletest.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve CMake exported targets.

Browse Source 
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>
pull/1682/head
Dakota Hawkins 7 years ago
parent b88511ef64
commit 759ef7c4e9
No known key found for this signature in database
GPG Key ID: 9590B5EF5F7995C3
4 changed files with 122 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      CMakeLists.txt
  2. 35
      cmake/googletestConfig.cmake.in
  3. 39
      googlemock/CMakeLists.txt
  4. 31
      googletest/CMakeLists.txt

37
CMakeLists.txt
Unescape View File

@ -1,22 +1,16 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.8)
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
endif (POLICY CMP0048)
project( googletest-distribution )
project(googletest-distribution)
set(GOOGLETEST_VERSION 1.9.0)
enable_testing()
include(CMakeDependentOption)
if (CMAKE_VERSION VERSION_LESS 2.8.5)
set(CMAKE_INSTALL_BINDIR "bin" CACHE STRING "User executables (bin)")
set(CMAKE_INSTALL_LIBDIR "lib${LIB_SUFFIX}" CACHE STRING "Object code libraries (lib)")
set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "C header files (include)")
mark_as_advanced(CMAKE_INSTALL_BINDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR)
else()
include(GNUInstallDirs)
endif()
include(GNUInstallDirs)
option(BUILD_GTEST "Builds the googletest subproject" OFF)
@ -26,8 +20,31 @@ option(BUILD_GMOCK "Builds the googlemock subproject" ON)
cmake_dependent_option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON "BUILD_GTEST OR BUILD_GMOCK" OFF)
cmake_dependent_option(INSTALL_GMOCK "Enable installation of googlemock. (Projects embedding googlemock may want to turn this OFF.)" ON "BUILD_GMOCK" OFF)
if(WIN32)
set(INSTALL_CMAKE_DIR "cmake" CACHE PATH "CMake exported targets")
else()
set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/gtest" CACHE PATH "CMake exported targets")
endif()
set(googletest_install_targets)
if(BUILD_GMOCK)
add_subdirectory( googlemock )
elseif(BUILD_GTEST)
add_subdirectory( googletest )
endif()
if(googletest_install_targets)
include(CMakePackageConfigHelpers)
configure_package_config_file(
"${CMAKE_CURRENT_LIST_DIR}/cmake/googletestConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/googletestConfig.cmake"
INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}")
write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/googletestConfigVersion.cmake
VERSION "${GOOGLETEST_VERSION}"
COMPATIBILITY SameMajorVersion)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/googletestConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/googletestConfigVersion.cmake
DESTINATION "${INSTALL_CMAKE_DIR}")
endif()

35
cmake/googletestConfig.cmake.in
Unescape View File

@ -0,0 +1,35 @@
@PACKAGE_INIT@
set(googletest_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
set(googletest_NAMESPACE_TARGETS)
set(googletest_ALL_INCLUDE_DIRS)
foreach(target @googletest_install_targets@)
include(${CMAKE_CURRENT_LIST_DIR}/${target}ConfigInternal.cmake)
add_library(googletest::${target} INTERFACE IMPORTED)
set_target_properties(googletest::${target}
PROPERTIES
INTERFACE_LINK_LIBRARIES googletest_${target}
IMPORTED_GLOBAL ON)
if(googletest_BUILD_SHARED_LIBS)
set_target_properties(googletest::${target}
PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
endif()
add_library(${target} ALIAS googletest::${target})
get_target_property(${target}_INCLUDE_DIRS googletest_${target} INTERFACE_INCLUDE_DIRECTORIES)
list(APPEND googletest_ALL_INCLUDE_DIRS ${${target}_INCLUDE_DIRS})
list(APPEND googletest_NAMESPACE_TARGETS googletest::${target})
endforeach()
list(REMOVE_DUPLICATES googletest_ALL_INCLUDE_DIRS)
set(GOOGLETEST_INCLUDE_DIRS ${googletest_ALL_INCLUDE_DIRS})
list(REMOVE_DUPLICATES googletest_NAMESPACE_TARGETS)
set(GOOGLETEST_LIBRARIES ${googletest_NAMESPACE_TARGETS})
set(GOOGLETEST_VERSION "@GOOGLETEST_VERSION@")

39
googlemock/CMakeLists.txt
Unescape View File

@ -37,7 +37,7 @@ if (CMAKE_VERSION VERSION_LESS 3.0)
project(gmock CXX C)
else()
cmake_policy(SET CMP0048 NEW)
project(gmock VERSION 1.9.0 LANGUAGES CXX C)
project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
endif()
cmake_minimum_required(VERSION 2.6.4)
@ -120,18 +120,45 @@ endif()
# 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(gmock SYSTEM INTERFACE "${gmock_SOURCE_DIR}/include")
target_include_directories(gmock_main SYSTEM INTERFACE "${gmock_SOURCE_DIR}/include")
target_include_directories(gmock SYSTEM
INTERFACE
$<BUILD_INTERFACE:${gmock_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${gmock_SOURCE_DIR}>
$<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${gtest_SOURCE_DIR}>
$<INSTALL_INTERFACE:include>)
target_include_directories(gmock_main SYSTEM
INTERFACE
$<BUILD_INTERFACE:${gmock_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${gmock_SOURCE_DIR}>
$<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${gtest_SOURCE_DIR}>
$<INSTALL_INTERFACE:include>)
endif()
########################################################################
#
# Install rules
if(INSTALL_GMOCK)
install(TARGETS gmock gmock_main
install(TARGETS gmock
EXPORT gmockConfigInternal
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(EXPORT gmockConfigInternal
DESTINATION "${INSTALL_CMAKE_DIR}"
NAMESPACE googletest_)
install(TARGETS gmock_main
EXPORT gmock_mainConfigInternal
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(EXPORT gmock_mainConfigInternal
DESTINATION "${INSTALL_CMAKE_DIR}"
NAMESPACE googletest_)
set(googletest_install_targets
${googletest_install_targets} gmock gmock_main PARENT_SCOPE)
install(DIRECTORY "${gmock_SOURCE_DIR}/include/gmock"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

31
googletest/CMakeLists.txt
Unescape View File

@ -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}")

Write Preview
Loading…
Cancel
Save