From 53d7a87af1d00d43b439ee46534646e7a823e0b3 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 2 Nov 2017 16:05:11 +0300 Subject: [PATCH] Added cmake-files for missing projects --- 3party/opening_hours/CMakeLists.txt | 2 + .../CMakeLists.txt | 11 +++++ .../CMakeLists.txt | 11 +++++ .../opening_hours_tests/CMakeLists.txt | 9 ++-- generator/CMakeLists.txt | 5 ++ .../booking_quality_check/CMakeLists.txt | 40 ++++++++++++++++ .../feature_segments_checker/CMakeLists.txt | 44 +++++++++++++++++ generator/restaurants_info/CMakeLists.txt | 41 ++++++++++++++++ .../srtm_coverage_checker/CMakeLists.txt | 47 +++++++++++++++++++ .../srtm_coverage_checker.cpp | 33 ++++++++++++- map/CMakeLists.txt | 2 + map/benchmark_tool/CMakeLists.txt | 43 +++++++++++++++++ 12 files changed, 282 insertions(+), 6 deletions(-) create mode 100644 3party/opening_hours/opening_hours_integration_tests/CMakeLists.txt create mode 100644 3party/opening_hours/opening_hours_supported_features_tests/CMakeLists.txt create mode 100644 generator/booking_quality_check/CMakeLists.txt create mode 100644 generator/feature_segments_checker/CMakeLists.txt create mode 100644 generator/restaurants_info/CMakeLists.txt create mode 100644 generator/srtm_coverage_checker/CMakeLists.txt create mode 100644 map/benchmark_tool/CMakeLists.txt diff --git a/3party/opening_hours/CMakeLists.txt b/3party/opening_hours/CMakeLists.txt index b26ac5981b..752184c616 100644 --- a/3party/opening_hours/CMakeLists.txt +++ b/3party/opening_hours/CMakeLists.txt @@ -34,3 +34,5 @@ set( add_library(opening_hours ${SRC}) omim_add_test_subdirectory(opening_hours_tests) +omim_add_test_subdirectory(opening_hours_integration_tests) +omim_add_test_subdirectory(opening_hours_supported_features_tests) diff --git a/3party/opening_hours/opening_hours_integration_tests/CMakeLists.txt b/3party/opening_hours/opening_hours_integration_tests/CMakeLists.txt new file mode 100644 index 0000000000..564e7c5ed3 --- /dev/null +++ b/3party/opening_hours/opening_hours_integration_tests/CMakeLists.txt @@ -0,0 +1,11 @@ +project(opening_hours_integration_tests) + +include_directories(${PROJECT_SOURCE_DIR} ${OMIM_ROOT}/3party/opening_hours) + +set( + SRC + opening_hours_integration_tests.cpp +) + +add_executable(${PROJECT_NAME} ${SRC}) +omim_link_libraries(${PROJECT_NAME} base opening_hours) diff --git a/3party/opening_hours/opening_hours_supported_features_tests/CMakeLists.txt b/3party/opening_hours/opening_hours_supported_features_tests/CMakeLists.txt new file mode 100644 index 0000000000..03beb3ca6b --- /dev/null +++ b/3party/opening_hours/opening_hours_supported_features_tests/CMakeLists.txt @@ -0,0 +1,11 @@ +project(opening_hours_supported_features_tests) + +include_directories(${PROJECT_SOURCE_DIR} ${OMIM_ROOT}/3party/opening_hours) + +set( + SRC + opening_hours_supported_features_tests.cpp +) + +add_executable(${PROJECT_NAME} ${SRC}) +omim_link_libraries(${PROJECT_NAME} base opening_hours) diff --git a/3party/opening_hours/opening_hours_tests/CMakeLists.txt b/3party/opening_hours/opening_hours_tests/CMakeLists.txt index 5f805e6ef4..b8a892a4e3 100644 --- a/3party/opening_hours/opening_hours_tests/CMakeLists.txt +++ b/3party/opening_hours/opening_hours_tests/CMakeLists.txt @@ -1,12 +1,11 @@ -set(OPENING_HOURS_INCLUDE ../opening_hours) - -include_directories(${PROJECT_SOURCE_DIR}) +project(opening_hours_tests) +include_directories(${PROJECT_SOURCE_DIR} ${OMIM_ROOT}/3party/opening_hours) set( SRC opening_hours_tests.cpp ) -add_executable(opening_hours_tests ${SRC}) -omim_link_libraries(opening_hours_tests base opening_hours) +add_executable(${PROJECT_NAME} ${SRC}) +omim_link_libraries(${PROJECT_NAME} base opening_hours) diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index 815bb5540a..9839fc2c15 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -117,3 +117,8 @@ omim_add_test_subdirectory(generator_tests) if (NOT SKIP_GTOOL) add_subdirectory(generator_tool) endif() + +add_subdirectory(booking_quality_check) +add_subdirectory(feature_segments_checker) +add_subdirectory(restaurants_info) +add_subdirectory(srtm_coverage_checker) diff --git a/generator/booking_quality_check/CMakeLists.txt b/generator/booking_quality_check/CMakeLists.txt new file mode 100644 index 0000000000..97ee984590 --- /dev/null +++ b/generator/booking_quality_check/CMakeLists.txt @@ -0,0 +1,40 @@ +project(booking_quality_check) + +include_directories( + ${OMIM_ROOT}/3party/gflags/src + ${OMIM_ROOT}/3party/jansson/src +) + +set( + SRC + booking_quality_check.cpp +) + +omim_add_executable(${PROJECT_NAME} ${SRC}) + +omim_link_libraries( + ${PROJECT_NAME} + generator + search + routing + routing_common + indexer + geometry + editor + platform + coding + base + expat + gflags + icu + jansson + oauthcpp + opening_hours + protobuf + pugixml + stats_client + succinct + ${LIBZ} +) + +link_qt5_core(${PROJECT_NAME}) diff --git a/generator/feature_segments_checker/CMakeLists.txt b/generator/feature_segments_checker/CMakeLists.txt new file mode 100644 index 0000000000..53f9f931e6 --- /dev/null +++ b/generator/feature_segments_checker/CMakeLists.txt @@ -0,0 +1,44 @@ +project(feature_segments_checker) + +include_directories( + ${OMIM_ROOT}/3party/gflags/src + ${OMIM_ROOT}/3party/jansson/src +) + +set( + SRC + feature_segments_checker.cpp +) + +omim_add_executable(${PROJECT_NAME} ${SRC}) + +omim_link_libraries( + ${PROJECT_NAME} + generator + map + editor + routing + traffic + routing_common + storage + ugc + indexer + platform + geometry + coding + base + expat + gflags + icu + jansson + minizip + oauthcpp + opening_hours + protobuf + pugixml + stats_client + succinct + ${LIBZ} +) + +link_qt5_core(${PROJECT_NAME}) diff --git a/generator/restaurants_info/CMakeLists.txt b/generator/restaurants_info/CMakeLists.txt new file mode 100644 index 0000000000..e91f43dd8a --- /dev/null +++ b/generator/restaurants_info/CMakeLists.txt @@ -0,0 +1,41 @@ +project(restaurants_info) + +include_directories( + ${OMIM_ROOT}/3party/gflags/src + ${OMIM_ROOT}/3party/jansson/src +) + +set( + SRC + restaurants_info.cpp +) + +omim_add_executable(${PROJECT_NAME} ${SRC}) + +omim_link_libraries( + ${PROJECT_NAME} + generator + search + routing + routing_common + indexer + geometry + editor + platform + coding + base + minizip + jansson + pugixml + stats_client + opening_hours + succinct + gflags + oauthcpp + expat + protobuf + icu + ${LIBZ} +) + +link_qt5_core(${PROJECT_NAME}) diff --git a/generator/srtm_coverage_checker/CMakeLists.txt b/generator/srtm_coverage_checker/CMakeLists.txt new file mode 100644 index 0000000000..09ffec1861 --- /dev/null +++ b/generator/srtm_coverage_checker/CMakeLists.txt @@ -0,0 +1,47 @@ +project(srtm_coverage_checker) + +include_directories( + ${OMIM_ROOT}/3party/gflags/src + ${OMIM_ROOT}/3party/jansson/src +) + +set( + SRC + srtm_coverage_checker.cpp +) + +omim_add_executable(${PROJECT_NAME} ${SRC}) + +omim_link_libraries( + ${PROJECT_NAME} + generator + map + editor + routing + routing_common + search + storage + ugc + traffic + indexer + platform + editor + geometry + coding + base + agg + gflags + icu + jansson + minizip + oauthcpp + opening_hours + osrm + protobuf + pugixml + stats_client + succinct + ${LIBZ} +) + +link_qt5_core(${PROJECT_NAME}) diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp index 18ed6fd9c0..70054c0c27 100644 --- a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp +++ b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp @@ -20,6 +20,37 @@ DEFINE_string(srtm_path, "", "Path to directory with SRTM files"); DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)"); +// TODO: remove when routing_test_tools becomes a library. +namespace +{ +void ChangeMaxNumberOfOpenFiles(size_t n) +{ + struct rlimit rlp; + getrlimit(RLIMIT_NOFILE, &rlp); + rlp.rlim_cur = n; + setrlimit(RLIMIT_NOFILE, &rlp); +} + +shared_ptr CreateFeaturesFetcher(vector const & localFiles) +{ + size_t const maxOpenFileNumber = 1024; + ChangeMaxNumberOfOpenFiles(maxOpenFileNumber); + shared_ptr featuresFetcher(new model::FeaturesFetcher); + featuresFetcher->InitClassificator(); + + for (LocalCountryFile const & localFile : localFiles) + { + auto p = featuresFetcher->RegisterMap(localFile); + if (p.second != MwmSet::RegResult::Success) + { + ASSERT(false, ("Can't register", localFile)); + return nullptr; + } + } + return featuresFetcher; +} +} // namespace + int main(int argc, char * argv[]) { google::SetUsageMessage("SRTM coverage checker."); @@ -42,7 +73,7 @@ int main(int argc, char * argv[]) platform::FindAllLocalMapsAndCleanup(numeric_limits::max() /* latestVersion */, localFiles); - auto fetcher = integration::CreateFeaturesFetcher(localFiles); + auto fetcher = CreateFeaturesFetcher(localFiles); generator::SrtmTileManager manager(FLAGS_srtm_path); for (auto & file : localFiles) diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index 2091d3e520..18e8a986ce 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -84,3 +84,5 @@ add_library(${PROJECT_NAME} ${SRC}) omim_add_test_subdirectory(map_tests) omim_add_test_subdirectory(mwm_tests) omim_add_test_subdirectory(style_tests) + +add_subdirectory(benchmark_tool) diff --git a/map/benchmark_tool/CMakeLists.txt b/map/benchmark_tool/CMakeLists.txt new file mode 100644 index 0000000000..2c591292c0 --- /dev/null +++ b/map/benchmark_tool/CMakeLists.txt @@ -0,0 +1,43 @@ +project(benchmark_tool) + +include_directories( + ${OMIM_ROOT}/3party/gflags/src + ${OMIM_ROOT}/3party/jansson/src +) + +set( + SRC + api.cpp + api.hpp + features_loading.cpp + main.cpp +) + +omim_add_executable(${PROJECT_NAME} ${SRC}) + +omim_link_libraries( + ${PROJECT_NAME} + map + ugc + indexer + platform + editor + geometry + coding + base + opening_hours + gflags + jansson + protobuf + succinct + pugixml + oauthcpp + gflags + stats_client + icu + agg + ${LIBZ} +) + +link_qt5_core(${PROJECT_NAME}) +link_qt5_network(${PROJECT_NAME})