Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
6c5c4554
Commit
6c5c4554
authored
Mar 29, 2021
by
Dino Radaković
Browse files
Merge pull request #3155 from ZedThree:cmake-alias-libraries
PiperOrigin-RevId: 365572439
parents
df7fee58
2292b6d8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
googletest/CMakeLists.txt
googletest/CMakeLists.txt
+4
-1
googletest/cmake/internal_utils.cmake
googletest/cmake/internal_utils.cmake
+1
-0
No files found.
googletest/CMakeLists.txt
View file @
6c5c4554
...
...
@@ -92,10 +92,13 @@ include(cmake/internal_utils.cmake)
config_compiler_and_linker
()
# Defined in internal_utils.cmake.
# Needed to set the namespace for both the export targets and the
# alias libraries
set
(
cmake_package_name GTest CACHE INTERNAL
""
)
# Create the CMake package file descriptors.
if
(
INSTALL_GTEST
)
include
(
CMakePackageConfigHelpers
)
set
(
cmake_package_name GTest
)
set
(
targets_export_name
${
cmake_package_name
}
Targets CACHE INTERNAL
""
)
set
(
generated_dir
"
${
CMAKE_CURRENT_BINARY_DIR
}
/generated"
CACHE INTERNAL
""
)
set
(
cmake_files_install_dir
"
${
CMAKE_INSTALL_LIBDIR
}
/cmake/
${
cmake_package_name
}
"
)
...
...
googletest/cmake/internal_utils.cmake
View file @
6c5c4554
...
...
@@ -150,6 +150,7 @@ function(cxx_library_with_type name type cxx_flags)
# type can be either STATIC or SHARED to denote a static or shared library.
# ARGN refers to additional arguments after 'cxx_flags'.
add_library
(
${
name
}
${
type
}
${
ARGN
}
)
add_library
(
${
cmake_package_name
}
::
${
name
}
ALIAS
${
name
}
)
set_target_properties
(
${
name
}
PROPERTIES
COMPILE_FLAGS
"
${
cxx_flags
}
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment