Now coding tests compile and pass.

1 files changed, 16 insertions, 4 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 833d04fd54..5930c981c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,21 @@ cmake_minimum_required(VERSION 3.2)
 
 project(omim C CXX)
 
+add_subdirectory(3party/minizip)
+add_subdirectory(3party/succinct)
+add_subdirectory(3party/tomcrypt)
+
+
 add_compile_options(
     "-Wall"
-    "-pedantic"
     "-std=c++11"
 )
 
 find_package(Threads)
+find_library(LIBZ NAMES z)
+if(LIBZ STREQUAL "LIBZ-NOTFOUND")
+   message(FATAL_ERROR "Failed to find libz library.")
+endif()
 
 get_filename_component(PROJECT_SOURCE_DIR . ABSOLUTE)
 
@@ -29,20 +37,24 @@ if ("${NO_TESTS}" STREQUAL "")
     set(NO_TESTS FALSE)
 endif()
 
+
 function(omim_add_library library)
     add_library(${library} ${ARGN})
 endfunction()
 
+
 function(omim_add_executable executable)
     add_executable(${executable} ${ARGN})
 endfunction()
 
+
 function(omim_add_test executable)
     if (NOT ${NO_TESTS})
         omim_add_executable(${executable} ${PROJECT_SOURCE_DIR}/testing/testingmain.cpp ${ARGN})
     endif()
 endfunction()
 
+
 function(omim_link_libraries target)
     if (TARGET ${target})
         target_link_libraries(${target} ${ARGN} ${CMAKE_THREAD_LIBS_INIT})
@@ -54,6 +66,6 @@ endfunction()
 
 add_subdirectory(base)
 add_subdirectory(coding)
-add_subdirectory(editor)
-add_subdirectory(geometry)
-add_subdirectory(storage)
+#add_subdirectory(editor)
+#add_subdirectory(geometry)
+#add_subdirectory(storage)