gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed CMake builds on some platforms

Browse source
This commit is contained in:
r.kuznetsov 2017-11-14 14:53:14 +03:00
parent 24ff3e62bb
commit 48c1fd7cc0
8 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
View file

@ -4,6 +4,7 @@
#define BOOST_TEST_MODULE OpeningHoursIntegration
#include <algorithm>
#include <array>
#include <ctime>
#include <map>
@ -90,7 +91,7 @@ using TRuleFeatures = std::array<bool, Count_>;
std::ostream & operator<<(std::ostream & ost, TRuleFeatures const & f)
{
std::copy(begin(f), end(f), std::ostream_iterator<bool>(ost, "\t"));
std::copy(std::begin(f), std::end(f), std::ostream_iterator<bool>(ost, "\t"));
return ost;
}

2
generator/booking_quality_check/CMakeLists.txt
View file

@ -19,8 +19,8 @@ omim_link_libraries(
routing
routing_common
indexer
geometry
editor
geometry
platform
coding
base

4
generator/feature_segments_checker/CMakeLists.txt
View file

@ -16,13 +16,13 @@ omim_link_libraries(
${PROJECT_NAME}
generator
map
editor
routing
traffic
routing_common
storage
ugc
indexer
editor
storage
platform
geometry
coding

2
generator/restaurants_info/CMakeLists.txt
View file

@ -19,8 +19,8 @@ omim_link_libraries(
routing
routing_common
indexer
geometry
editor
geometry
platform
coding
base

3
generator/srtm_coverage_checker/CMakeLists.txt
View file

@ -16,7 +16,6 @@ omim_link_libraries(
${PROJECT_NAME}
generator
map
editor
routing
routing_common
search
@ -24,8 +23,8 @@ omim_link_libraries(
ugc
traffic
indexer
platform
editor
platform
geometry
coding
base

2
generator/srtm_coverage_checker/srtm_coverage_checker.cpp
View file

@ -15,6 +15,8 @@
#include <algorithm>
#include <sys/resource.h>
#include "3party/gflags/src/gflags/gflags.h"
DEFINE_string(srtm_path, "", "Path to directory with SRTM files");

4
map/CMakeLists.txt
View file

@ -85,4 +85,6 @@ omim_add_test_subdirectory(map_tests)
omim_add_test_subdirectory(mwm_tests)
omim_add_test_subdirectory(style_tests)
add_subdirectory(benchmark_tool)
if (PLATFORM_DESKTOP)
add_subdirectory(benchmark_tool)
endif()

21
map/benchmark_tool/CMakeLists.txt
View file

@ -20,22 +20,21 @@ omim_link_libraries(
map
ugc
indexer
platform
editor
geometry
platform
coding
base
opening_hours
gflags
jansson
protobuf
succinct
pugixml
oauthcpp
gflags
stats_client
icu
agg
gflags
icu
jansson
oauthcpp
opening_hours
protobuf
pugixml
stats_client
succinct
${LIBZ}
)