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.

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: macOS build #2551

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set(OSGEARTH_VERSION ${OSGEARTH_MAJOR_VERSION}.${OSGEARTH_MINOR_VERSION}.${OSGEA
# Increment this each time the ABI changes
set(OSGEARTH_SOVERSION 154)

# Require C++11
# Require C++14
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

Expand Down
8 changes: 8 additions & 0 deletions src/osgEarth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ find_package(SQLite3 REQUIRED)

# optional
find_package(geos QUIET)
IF(APPLE)
# support of newer protobuf cmake - module
set(protobuf_MODULE_COMPATIBLE ON CACHE BOOL "")
find_package(Protobuf REQUIRED CONFIG)
else()
find_package(Protobuf QUIET)
endif()

find_package(Protobuf QUIET)
find_package(blend2d QUIET)
find_package(blosc QUIET)
Expand Down
2 changes: 2 additions & 0 deletions src/osgEarth/CoverageLayer
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ namespace osgEarth

//! Table of preset sample values.
struct Presets : public std::unordered_map<std::string, Config> {
Presets() : _nodata() {
}
const Config _nodata;
inline const Config& get(const std::string& name) const;
};
Expand Down
2 changes: 1 addition & 1 deletion src/osgEarthCesium/CesiumCreditsNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace
auto searchStartItr = input.begin();
decltype(searchStartItr) imgItr;
while ((imgItr = std::search(searchStartItr, input.end(), img.begin(), img.end(),
[&](unsigned char c1, unsigned char c2)
[&](char c1, char c2)
{
return std::toupper(c1, locale) == std::toupper(c2, locale);
})) != input.end())
Expand Down
Loading