diff options
author | v.greshilov <v.greshilov@msk-wifi-25fap2-v_greshilov-s.subbotin.mail.msk> | 2017-12-06 16:49:08 +0300 |
---|---|---|
committer | Yuri Gorshenin <mipt.vi002@gmail.com> | 2017-12-06 17:18:02 +0300 |
commit | ea228447bef0c42544ec485406360a61adf7040f (patch) | |
tree | c76943591860867efa5a9db886a3008de8206ee3 /CMakeLists.txt | |
parent | d5cc29d044ec6814aa635c6c8e363b5df41aae81 (diff) |
[cmake] Fix building for SKIP_DESKTOP and SKIP_TESTS flags
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d3acdd3a4..d22c7e86d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,7 @@ if (PLATFORM_LINUX OR PLATFORM_MAC OR PLATFORM_WIN) else() set(PLATFORM_DESKTOP FALSE) endif() + # End of setting the target platform # Set build type: @@ -76,6 +77,7 @@ option(USE_ASAN "Enable Address Sanitizer" OFF) option(USE_TSAN "Enable Thread Sanitizer" OFF) option(PYBINDINGS "Create makefiles for building python bindings" OFF) option(SKIP_DESKTOP "Skip building of desktop application" OFF) +option(BUILD_MAPSHOT "Build mapshot tool" OFF) if (PLATFORM_LINUX) option(USE_PPROF "Enable Google Profiler" OFF) @@ -175,13 +177,14 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID) message(FATAL_ERROR "Qt5 cmake files were not found, please set QT_PATH environment variable") endif() if (Qt5Core_VERSION VERSION_LESS 5.5.0) - message(FATAL_ERROR "Minimum supported Qt5 version is 5.5") + message(FATAL_ERROR "Minimum supported Qt5 version is 5.5") endif() find_package(Qt5Network REQUIRED) + if (NOT SKIP_DESKTOP OR NOT SKIP_TESTS) + find_package(Qt5Widgets) + endif() if (NOT SKIP_DESKTOP) find_qt5_desktop_package(Qt5Gui) - find_qt5_desktop_package(Qt5OpenGL) - find_qt5_desktop_package(Qt5Widgets) find_qt5_desktop_package(Qt5Xml) find_qt5_desktop_package(Qt5Svg) find_qt5_desktop_package(Qt5WebEngineWidgets) @@ -391,8 +394,6 @@ add_subdirectory(partners_api) add_subdirectory(local_ads) add_subdirectory(ugc) -option(BUILD_MAPSHOT "Build mapshot tool" OFF) - if (PLATFORM_DESKTOP) if (BUILD_MAPSHOT) add_subdirectory(software_renderer) @@ -401,17 +402,16 @@ if (PLATFORM_DESKTOP) add_subdirectory(feature_list) add_subdirectory(generator) add_subdirectory(openlr) - add_subdirectory(skin_generator) add_subdirectory(track_analyzing) + if (NOT SKIP_DESKTOP) + add_subdirectory(qt) + add_subdirectory(skin_generator) + endif() endif() omim_add_test_subdirectory(qt_tstfrm) omim_add_test_subdirectory(3party/gmock) -if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID AND NOT SKIP_DESKTOP) - add_subdirectory(qt) -endif() - if (PLATFORM_ANDROID) add_subdirectory(android/jni) endif() |