Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vs2019 & namespace for install targets #349

Merged
merged 1 commit into from
Feb 3, 2024
Merged

Fix vs2019 & namespace for install targets #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ install(TARGETS s2 EXPORT s2Targets)
# that they can referenced by downstream projects as `s2::s2` after a
# successful `find_package` call.
install(EXPORT s2Targets
NAMESPACE s2
NAMESPACE s2::
FILE s2Targets.cmake
DESTINATION share/s2/)

Expand Down
3 changes: 3 additions & 0 deletions Config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(absl CONFIG)

include("${CMAKE_CURRENT_LIST_DIR}/s2Targets.cmake")
2 changes: 1 addition & 1 deletion src/s2/s2lax_polygon_shape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace {
template <typename T>
unique_ptr<T> make_unique_for_overwrite(size_t n) {
// We only need to support this one variant.
static_assert(std::is_array<T>::value);
static_assert(std::is_array<T>::value, "T must be an array type");
return unique_ptr<T>(new typename absl::remove_extent_t<T>[n]);
}
} // namespace
Expand Down