Skip to content

Commit

Permalink
CMake: Fixed typo affecting make install. Fixed Linux compile warning…
Browse files Browse the repository at this point in the history
…s. (#2463)
  • Loading branch information
emminizer authored Mar 13, 2024
1 parent 62ed49c commit c972d8c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/osgEarth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ if(OSGEARTH_ENABLE_IMGUI)
)
endif()

if(OSGERATH_BUILD_LEGACY_CONTROLS_API)
if(OSGEARTH_BUILD_LEGACY_CONTROLS_API)
list(APPEND LIB_PUBLIC_HEADERS
ActivityMonitorTool
MouseCoordsTool)
Expand Down
2 changes: 1 addition & 1 deletion src/osgEarth/StringUtils
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ namespace osgEarth { namespace Util
}
struct ci_string_less {
bool operator()(const std::string& lhs, const std::string& rhs) const {
for(auto i=0; i<std::min(lhs.size(), rhs.size()); ++i) {
for(size_t i=0; i<std::min(lhs.size(), rhs.size()); ++i) {
if (std::tolower(lhs[i]) < std::tolower(rhs[i])) return true;
if (std::tolower(lhs[i]) > std::tolower(rhs[i])) return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/osgEarth/weejobs.h
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ namespace WEEJOBS_NAMESPACE
{
if (pool != thief)
{
if (pool->_queue_size > max_num_jobs)
if (static_cast<std::size_t>(pool->_queue_size) > max_num_jobs)
{
max_num_jobs = pool->_queue_size;
pool_with_most_jobs = pool;
Expand Down

0 comments on commit c972d8c

Please sign in to comment.