diff options
| author | Timofey <t.danshin@corp.mail.ru> | 2016-11-28 16:08:07 +0300 |
|---|---|---|
| committer | Timofey <t.danshin@corp.mail.ru> | 2016-11-29 14:50:33 +0300 |
| commit | 6b174cc4338106abd2199cda486ebe6f7842161b (patch) | |
| tree | 18cbd2f6f536d0d4318a64c6c90fdae7ec5a60c8 /CMakeLists.txt | |
| parent | 6a46e8f17f442470b907b55ce4b6e9835c8b07c5 (diff) | |
Changed how libraries paths are added to the project.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3979fc215..41a9b85f3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,9 +67,9 @@ omim_set_platform_var(PLATFORM_LINUX "linux-.*" ${LINUX_DETECTED}) find_package(Threads) -find_package(Qt5Core REQUIRED) -find_package(Qt5Network REQUIRED) if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID) + find_package(Qt5Core REQUIRED) + find_package(Qt5Network REQUIRED) find_package(Qt5Gui REQUIRED) find_package(Qt5OpenGL REQUIRED) find_package(Qt5Widgets REQUIRED) @@ -91,9 +91,7 @@ get_filename_component(OMIM_ROOT . ABSOLUTE) include_directories( ${CMAKE_HOME_DIRECTORY} - ${Qt5Core_LIBRARIES} ${Qt5Core_INCLUDE_DIRS} - ${Qt5Network_LIBRARIES} ${Qt5Network_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY}/3party/boost ) @@ -109,6 +107,8 @@ endfunction() function(omim_add_test_subdirectory subdir) if (NOT NO_TESTS) add_subdirectory(${subdir}) + else() + message("NO_TESTS: Skipping subdirectory ${subdir}") endif() endfunction() @@ -166,8 +166,6 @@ add_subdirectory(3party/liboauthcpp) add_subdirectory(3party/pugixml) add_subdirectory(3party/succinct) add_subdirectory(3party/osrm) -add_subdirectory(3party/gmock) -add_subdirectory(qt_tstfrm) add_subdirectory(base) add_subdirectory(coding) add_subdirectory(geometry) @@ -183,3 +181,6 @@ add_subdirectory(search) add_subdirectory(tracking) add_subdirectory(traffic) add_subdirectory(partners_api) + +omim_add_test_subdirectory(qt_tstfrm) +omim_add_test_subdirectory(3party/gmock) |