From 3b23d5fe4f9f85cae008922faca59b5ba8900aad Mon Sep 17 00:00:00 2001 From: Timofey Date: Tue, 11 Oct 2016 13:07:27 +0300 Subject: [PATCH] Map, mwm_tests --- 3party/expat/CMakeLists.txt | 125 ++------- 3party/freetype/CMakeLists.txt | 494 ++++++++------------------------- 3party/fribidi/CMakeLists.txt | 60 ++++ CMakeLists.txt | 4 +- map/CMakeLists.txt | 68 +++++ map/mwm_tests/CMakeLists.txt | 49 ++++ 6 files changed, 312 insertions(+), 488 deletions(-) mode change 100755 => 100644 3party/expat/CMakeLists.txt create mode 100644 3party/fribidi/CMakeLists.txt create mode 100644 map/CMakeLists.txt create mode 100644 map/mwm_tests/CMakeLists.txt diff --git a/3party/expat/CMakeLists.txt b/3party/expat/CMakeLists.txt old mode 100755 new mode 100644 index bc930571b4..612a143c14 --- a/3party/expat/CMakeLists.txt +++ b/3party/expat/CMakeLists.txt @@ -1,111 +1,28 @@ -# This file is copyrighted under the BSD-license for buildsystem files of KDE -# copyright 2010, Patrick Spendrin +cmake_minimum_required(VERSION 3.2) -project(expat) +project(expat C CXX) -cmake_minimum_required(VERSION 2.6) -set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org") -set(PACKAGE_NAME "expat") -set(PACKAGE_VERSION "2.1.0") -set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -set(PACKAGE_TARNAME "${PACKAGE_NAME}") +add_definitions(-DHAVE_MEMMOVE) -option(BUILD_tools "build the xmlwf tool for expat library" ON) -option(BUILD_examples "build the examples for expat library" ON) -option(BUILD_tests "build the tests for expat library" ON) -option(BUILD_shared "build a shared expat library" ON) - -# configuration options -set(XML_CONTEXT_BYTES 1024 CACHE STRING "Define to specify how much context to retain around the current parse point") -option(XML_DTD "Define to make parameter entity parsing functionality available" ON) -option(XML_NS "Define to make XML Namespaces functionality available" ON) - -if(XML_DTD) - set(XML_DTD 1) -else(XML_DTD) - set(XML_DTD 0) -endif(XML_DTD) -if(XML_NS) - set(XML_NS 1) -else(XML_NS) - set(XML_NS 0) -endif(XML_NS) - -if(BUILD_tests) - enable_testing() -endif(BUILD_tests) - -include(ConfigureChecks.cmake) - -include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib) -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996) -endif(MSVC) - -set(expat_SRCS - lib/xmlparse.c - lib/xmlrole.c - lib/xmltok.c - lib/xmltok_impl.c - lib/xmltok_ns.c +add_compile_options( + "-Wall" ) -if(WIN32 AND BUILD_shared) - set(expat_SRCS ${expat_SRCS} lib/libexpat.def) -endif(WIN32 AND BUILD_shared) -if(BUILD_shared) - set(_SHARED SHARED) -else(BUILD_shared) - set(_SHARED STATIC) -endif(BUILD_shared) +set( + SRC + lib/ascii.h + lib/expat_external.h + lib/expat.h + lib/internal.h + lib/nametab.h + lib/xmlparse.c + lib/xmlrole.c + lib/xmlrole.h + lib/xmltok_impl.c + lib/xmltok_ns.c + lib/xmltok.c + lib/xmltok.h +) -add_library(expat ${_SHARED} ${expat_SRCS}) - -install(TARGETS expat RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix "\${prefix}/bin") -set(libdir "\${prefix}/lib") -set(includedir "\${prefix}/include") -configure_file(expat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/expat.pc) - -install(FILES lib/expat.h lib/expat_external.h DESTINATION include) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig) - - - -if(BUILD_tools AND NOT WINCE) - set(xmlwf_SRCS - xmlwf/xmlwf.c - xmlwf/xmlfile.c - xmlwf/codepage.c - xmlwf/readfilemap.c - ) - - add_executable(xmlwf ${xmlwf_SRCS}) - target_link_libraries(xmlwf expat) - install(TARGETS xmlwf DESTINATION bin) - install(FILES doc/xmlwf.1 DESTINATION share/man/man1) -endif(BUILD_tools AND NOT WINCE) - -if(BUILD_examples) - add_executable(elements examples/elements.c) - target_link_libraries(elements expat) - - add_executable(outline examples/outline.c) - target_link_libraries(outline expat) -endif(BUILD_examples) - -if(BUILD_tests) - ## these are unittests that can be run on any platform - add_executable(runtests tests/runtests.c tests/chardata.c tests/minicheck.c) - target_link_libraries(runtests expat) - add_test(runtests runtests) - - add_executable(runtestspp tests/runtestspp.cpp tests/chardata.c tests/minicheck.c) - target_link_libraries(runtestspp expat) - add_test(runtestspp runtestspp) -endif(BUILD_tests) +add_library(expat ${SRC}) diff --git a/3party/freetype/CMakeLists.txt b/3party/freetype/CMakeLists.txt index edcb64e873..7dda4bbb34 100644 --- a/3party/freetype/CMakeLists.txt +++ b/3party/freetype/CMakeLists.txt @@ -1,404 +1,132 @@ -# CMakeLists.txt -# -# Copyright 2013-2015 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# Written originally by John Cary -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. -# -# -# As a preliminary, create a compilation directory and change into it, for -# example -# -# mkdir ~/freetype2.compiled -# cd ~/freetype2.compiled -# -# Now you can say -# -# cmake -# -# to create a Makefile that builds a static version of the library. -# -# For a dynamic library, use -# -# cmake -D BUILD_SHARED_LIBS:BOOL=true -# -# For a framework on OS X, use -# -# cmake -D BUILD_FRAMEWORK:BOOL=true -G Xcode -# -# instead. -# -# For an iOS static library, use -# -# cmake -D IOS_PLATFORM=OS -G Xcode -# -# or -# -# cmake -D IOS_PLATFORM=SIMULATOR -G Xcode -# -# Please refer to the cmake manual for further options, in particular, how -# to modify compilation and linking parameters. -# -# Some notes. -# -# . `cmake' creates configuration files in -# -# /include/freetype/config -# -# which should be further modified if necessary. -# -# . You can use `cmake' directly on a freshly cloned FreeType git -# repository. -# -# . `CMakeLists.txt' is provided as-is since it is normally not used by the -# developer team. +cmake_minimum_required(VERSION 3.2) +project(freetype C CXX) -cmake_minimum_required(VERSION 2.6) - - -include(CheckIncludeFile) - - -# CMAKE_TOOLCHAIN_FILE must be set before `project' is called, which -# configures the base build environment and references the toolchain file -if (APPLE) - if (DEFINED IOS_PLATFORM) - if (NOT "${IOS_PLATFORM}" STREQUAL "OS" - AND NOT "${IOS_PLATFORM}" STREQUAL "SIMULATOR") - message(FATAL_ERROR - "IOS_PLATFORM must be set to either OS or SIMULATOR") - endif () - if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode") - message(AUTHOR_WARNING - "You should use Xcode generator with IOS_PLATFORM enabled to get Universal builds.") - endif () - if (BUILD_SHARED_LIBS) - message(FATAL_ERROR - "BUILD_SHARED_LIBS can not be on with IOS_PLATFORM enabled") - endif () - if (BUILD_FRAMEWORK) - message(FATAL_ERROR - "BUILD_FRAMEWORK can not be on with IOS_PLATFORM enabled") - endif () - - # iOS only uses static libraries - set(BUILD_SHARED_LIBS OFF) - - set(CMAKE_TOOLCHAIN_FILE - ${PROJECT_SOURCE_DIR}/builds/cmake/iOS.cmake) - endif () -else () - if (DEFINED IOS_PLATFORM) - message(FATAL_ERROR "IOS_PLATFORM is not supported on this platform") - endif () -endif () - -if (WIN32 AND BUILD_SHARED_LIBS) - message(FATAL_ERROR "Shared libraries not supported on Windows.") -endif () - - -project(freetype) - - -# Disallow in-source builds -if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") - message(FATAL_ERROR - " -In-source builds are not permitted! Make a separate folder for" - " building, e.g.," - " - mkdir build; cd build; cmake .." - " -Before that, remove the files created by this failed run with" - " - rm -rf CMakeCache.txt CMakeFiles") -endif () - - -# Add local cmake modules -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/builds) - - -if (BUILD_FRAMEWORK) - if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode") - message(FATAL_ERROR - "You should use Xcode generator with BUILD_FRAMEWORK enabled") - endif () - set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)") - set(BUILD_SHARED_LIBS ON) -endif () - - -set(VERSION_MAJOR "2") -set(VERSION_MINOR "6") -set(VERSION_PATCH "0") - -set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) -set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) - - -# Compiler definitions for building the library add_definitions(-DFT2_BUILD_LIBRARY) - -# Find dependencies -find_package(ZLIB) -find_package(BZip2) -find_package(PNG) -find_package(HarfBuzz) - - -message(STATUS - "Creating directory ${PROJECT_BINARY_DIR}/include/freetype/config") -file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/include/freetype/config") - - -# Create the configuration file -message(STATUS - "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h") - -if (UNIX) - check_include_file("unistd.h" HAVE_UNISTD_H) - check_include_file("fcntl.h" HAVE_FCNTL_H) - check_include_file("stdint.h" HAVE_STDINT_H) - - file(READ "${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in" - FTCONFIG_H) - if (HAVE_UNISTD_H) - string(REGEX REPLACE - "#undef +(HAVE_UNISTD_H)" "#define \\1" - FTCONFIG_H "${FTCONFIG_H}") - endif () - if (HAVE_FCNTL_H) - string(REGEX REPLACE - "#undef +(HAVE_FCNTL_H)" "#define \\1" - FTCONFIG_H "${FTCONFIG_H}") - endif () - if (HAVE_STDINT_H) - string(REGEX REPLACE - "#undef +(HAVE_STDINT_H)" "#define \\1" - FTCONFIG_H "${FTCONFIG_H}") - endif () - string(REPLACE "/undef " "#undef " - FTCONFIG_H "${FTCONFIG_H}") - file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" - "${FTCONFIG_H}") -else () - file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h" - FTCONFIG_H) - file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" - "${FTCONFIG_H}") +if (PLATFORM_LINUX AND CMAKE_COMPILER_IS_GNUCXX) + add_definitions(-DOMIM_FULL_FREETYPE) endif () +add_compile_options( + "-Wall" +) -# Create the options file -message(STATUS - "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h") - -file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftoption.h" - FTOPTION_H) -if (ZLIB_FOUND) - string(REGEX REPLACE - "/\\* +(#define +FT_CONFIG_OPTION_SYSTEM_ZLIB) +\\*/" "\\1" - FTOPTION_H "${FTOPTION_H}") -endif () -if (BZIP2_FOUND) - string(REGEX REPLACE - "/\\* +(#define +FT_CONFIG_OPTION_USE_BZIP2) +\\*/" "\\1" - FTOPTION_H "${FTOPTION_H}") -endif () -if (PNG_FOUND) - string(REGEX REPLACE - "/\\* +(#define +FT_CONFIG_OPTION_USE_PNG) +\\*/" "\\1" - FTOPTION_H "${FTOPTION_H}") -endif () -if (HARFBUZZ_FOUND) - string(REGEX REPLACE - "/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1" - FTOPTION_H "${FTOPTION_H}") -endif () -file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h" - "${FTOPTION_H}") +include_directories(include) -# Specify library include directories -include_directories("${PROJECT_SOURCE_DIR}/include") -include_directories(BEFORE "${PROJECT_BINARY_DIR}/include") - - -file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h") -file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype/config/*.h") -file(GLOB PRIVATE_HEADERS "include/freetype/internal/*.h") - - -set(BASE_SRCS - src/autofit/autofit.c - src/base/ftbase.c - src/base/ftbbox.c - src/base/ftbdf.c +set( + SRC + src/autofit/afangles.c + src/autofit/afblue.c + src/autofit/afcjk.c + src/autofit/afdummy.c + src/autofit/afglobal.c + src/autofit/afhints.c + src/autofit/afindic.c + src/autofit/aflatin.c + src/autofit/afloader.c + src/autofit/afmodule.c + src/autofit/afranges.c + src/autofit/afwarp.c + src/autofit/hbshim.c + src/base/ftadvanc.c src/base/ftbitmap.c - src/base/ftcid.c - src/base/ftfntfmt.c - src/base/ftfstype.c - src/base/ftgasp.c + src/base/ftcalc.c + src/base/ftgloadr.c src/base/ftglyph.c - src/base/ftgxval.c src/base/ftinit.c - src/base/ftlcdfil.c - src/base/ftmm.c - src/base/ftotval.c - src/base/ftpatent.c - src/base/ftpfr.c + src/base/ftobjs.c + src/base/ftoutln.c + src/base/ftrfork.c + src/base/ftstream.c src/base/ftstroke.c - src/base/ftsynth.c src/base/ftsystem.c - src/base/fttype1.c - src/base/ftwinfnt.c - src/bdf/bdf.c - src/bzip2/ftbzip2.c - src/cache/ftcache.c - src/cff/cff.c - src/cid/type1cid.c + src/base/fttrigon.c + src/base/ftutil.c + src/bdf/bdfdrivr.c + src/bdf/bdflib.c + src/cache/ftcbasic.c + src/cache/ftccache.c + src/cache/ftccmap.c + src/cache/ftcglyph.c + src/cache/ftcimage.c + src/cache/ftcmanag.c + src/cache/ftcmru.c + src/cache/ftcsbits.c + src/cff/cf2ft.c + src/cff/cf2font.c + src/cff/cf2blues.c + src/cff/cf2intrp.c + src/cff/cf2stack.c + src/cff/cf2arrst.c + src/cff/cf2hints.c + src/cff/cf2error.c + src/cff/cf2read.c + src/cff/cffcmap.c + src/cff/cffdrivr.c + src/cff/cffgload.c + src/cff/cffload.c + src/cff/cffobjs.c + src/cff/cffparse.c + src/cid/cidriver.c + src/cid/cidgload.c + src/cid/cidload.c + src/cid/cidobjs.c + src/cid/cidparse.c src/gzip/ftgzip.c src/lzw/ftlzw.c - src/pcf/pcf.c - src/pfr/pfr.c - src/psaux/psaux.c - src/pshinter/pshinter.c - src/psnames/psnames.c - src/raster/raster.c - src/sfnt/sfnt.c - src/smooth/smooth.c + src/pcf/pcfdrivr.c + src/pcf/pcfread.c + src/pcf/pcfutil.c + src/pfr/pfrcmap.c + src/pfr/pfrdrivr.c + src/pfr/pfrgload.c + src/pfr/pfrload.c + src/pfr/pfrobjs.c + src/pfr/pfrsbit.c + src/psaux/afmparse.c + src/psaux/psauxmod.c + src/psaux/psconv.c + src/psaux/psobjs.c + src/psaux/t1cmap.c + src/psaux/t1decode.c + src/pshinter/pshalgo.c + src/pshinter/pshglob.c + src/pshinter/pshmod.c + src/pshinter/pshrec.c + src/psnames/psmodule.c + src/raster/ftraster.c + src/raster/ftrend1.c + src/sfnt/sfdriver.c + src/sfnt/sfobjs.c + src/sfnt/ttbdf.c + src/sfnt/ttcmap.c + src/sfnt/ttkern.c + src/sfnt/ttload.c + src/sfnt/ttmtx.c + src/sfnt/ttpost.c + src/sfnt/ttsbit.c + src/smooth/ftgrays.c + src/smooth/ftsmooth.c + src/truetype/ttdriver.c + src/truetype/ttgload.c + src/truetype/ttinterp.c + src/truetype/ttobjs.c + src/truetype/ttpload.c src/truetype/truetype.c - src/type1/type1.c + src/type1/t1afm.c + src/type1/t1driver.c + src/type1/t1gload.c + src/type1/t1load.c + src/type1/t1objs.c + src/type1/t1parse.c + src/type42/t42drivr.c + src/type42/t42objs.c + src/type42/t42parse.c src/type42/type42.c src/winfonts/winfnt.c + src/cache/ftstrokedcache.c ) -if (WIN32) - set(BASE_SRCS ${BASE_SRCS} builds/windows/ftdebug.c) -elseif (WINCE) - set(BASE_SRCS ${BASE_SRCS} builds/wince/ftdebug.c) -else () - set(BASE_SRCS ${BASE_SRCS} src/base/ftdebug.c) -endif () - - -if (BUILD_FRAMEWORK) - set(BASE_SRCS - ${BASE_SRCS} - builds/mac/freetype-Info.plist - ) -endif () - - -add_library(freetype - ${PUBLIC_HEADERS} - ${PUBLIC_CONFIG_HEADERS} - ${PRIVATE_HEADERS} - ${BASE_SRCS} -) - - -if (BUILD_SHARED_LIBS) - set_target_properties(freetype PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${SHARED_LIBRARY_VERSION} - COMPILE_DEFINITIONS freetype_EXPORTS - ) -endif () - - -if (BUILD_FRAMEWORK) - set_property(SOURCE ${PUBLIC_CONFIG_HEADERS} - PROPERTY MACOSX_PACKAGE_LOCATION Headers/config - ) - set_target_properties(freetype PROPERTIES - FRAMEWORK TRUE - MACOSX_FRAMEWORK_INFO_PLIST builds/mac/freetype-Info.plist - PUBLIC_HEADER "${PUBLIC_HEADERS}" - XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" - ) -endif () - - -if (MSVC) - set_target_properties(freetype PROPERTIES - COMPILE_FLAGS /Fd"$(IntDir)$(TargetName).pdb") -endif () - - -if (ZLIB_FOUND) - target_link_libraries(freetype ${ZLIB_LIBRARIES}) - include_directories(${ZLIB_INCLUDE_DIRS}) -endif () -if (BZIP2_FOUND) - target_link_libraries(freetype ${BZIP2_LIBRARIES}) - include_directories(${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS -endif () -if (PNG_FOUND) - add_definitions(${PNG_DEFINITIONS}) - target_link_libraries(freetype ${PNG_LIBRARIES}) - include_directories(${PNG_INCLUDE_DIRS}) -endif () -if (HARFBUZZ_FOUND) - target_link_libraries(freetype ${HARFBUZZ_LIBRARIES}) - include_directories(${HARFBUZZ_INCLUDE_DIRS}) -endif () - - -# Installations -# Note the trailing slash in the argument to the `DIRECTORY' directive -install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ - DESTINATION include/freetype2 - PATTERN "internal" EXCLUDE - PATTERN "ftconfig.h" EXCLUDE - PATTERN "ftoption.h" EXCLUDE -) -install(FILES - ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h - ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h - DESTINATION include/freetype2/freetype/config -) -install(TARGETS freetype - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - FRAMEWORK DESTINATION Library/Frameworks -) - - -# Packaging -# CPack version numbers for release tarball name. -set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}}) -if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY) - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_NAME}") -endif () -if (NOT DEFINED CPACK_SOURCE_PACKAGE_FILE_NAME) - set(CPACK_SOURCE_PACKAGE_FILE_NAME - "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}-r${PROJECT_REV}" - CACHE INTERNAL "tarball basename" - ) -endif () -set(CPACK_SOURCE_GENERATOR TGZ) -set(CPACK_SOURCE_IGNORE_FILES - "/CVS/;/.svn/;.swp$;.#;/#;/build/;/serial/;/ser/;/parallel/;/par/;~;/preconfig.out;/autom4te.cache/;/.config") -set(CPACK_GENERATOR TGZ) -include(CPack) - - -# add make dist target -add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) - - -# eof +add_library(freetype ${SRC}) diff --git a/3party/fribidi/CMakeLists.txt b/3party/fribidi/CMakeLists.txt new file mode 100644 index 0000000000..3ec3f4bbd6 --- /dev/null +++ b/3party/fribidi/CMakeLists.txt @@ -0,0 +1,60 @@ +cmake_minimum_required(VERSION 3.2) + +project(fribidi C CXX) + +include_directories(lib ./) + +add_definitions(-DHAVE_CONFIG_H) + +add_compile_options( + "-Wall" +) + + +set( + SRC + config_android.h + config_ios.h + config_mac.h + config_tizen.h + config_win32.h + config.h + lib/bidi-types.h + lib/common.h + lib/debug.h + lib/fribidi-arabic.c + lib/fribidi-arabic.h + lib/fribidi-begindecls.h + lib/fribidi-bidi-types-list.h + lib/fribidi-bidi-types.c + lib/fribidi-bidi-types.h + lib/fribidi-bidi.c + lib/fribidi-bidi.h + lib/fribidi-common.h + lib/fribidi-config.h + lib/fribidi-deprecated.c + lib/fribidi-deprecated.h + lib/fribidi-enddecls.h + lib/fribidi-flags.h + lib/fribidi-joining-types-list.h + lib/fribidi-joining-types.c + lib/fribidi-joining-types.h + lib/fribidi-joining.c + lib/fribidi-joining.h + lib/fribidi-mem.c + lib/fribidi-mirroring.c + lib/fribidi-mirroring.h + lib/fribidi-run.c + lib/fribidi-shape.c + lib/fribidi-shape.h + lib/fribidi-types.h + lib/fribidi-unicode-version.h + lib/fribidi-unicode.h + lib/fribidi.c + lib/fribidi.h + lib/joining-types.h + lib/mem.h + lib/run.h +) + +add_library(fribidi ${SRC}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 442c92d28a..07b4cdde4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,9 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) find_package(Threads) find_package(Qt5Core REQUIRED) -find_package(Qt5Network REQUIRED) find_package(Qt5Gui REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5OpenGL REQUIRED) find_package(Qt5Widgets REQUIRED) if (APPLE) @@ -132,6 +133,7 @@ endmacro() add_subdirectory(3party/jansson) add_subdirectory(3party/minizip) add_subdirectory(3party/tomcrypt) +add_subdirectory(map) add_compile_options( "-Wall" diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt new file mode 100644 index 0000000000..a610a5f254 --- /dev/null +++ b/map/CMakeLists.txt @@ -0,0 +1,68 @@ +include_directories( + ${OMIM_ROOT}/3party/protobuf/src + ${OMIM_ROOT}/3party/freetype/include + ${OMIM_ROOT}/3party/jansson/src + ${OMIM_ROOT}/3party/glm +) + +add_compile_options( + "-Wall" +) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + +set( + SRC + ../api/src/c/api-client.c + address_finder.cpp + api_mark_point.cpp + api_mark_point.hpp + booking_api.cpp + booking_api.hpp + bookmark_manager.cpp + bookmark_manager.hpp + bookmark.cpp + bookmark.hpp + chart_generator.cpp + chart_generator.hpp + displacement_mode_manager.cpp + displacement_mode_manager.hpp + feature_vec_model.cpp + feature_vec_model.hpp + framework.cpp + framework.hpp + ge0_parser.cpp + ge0_parser.hpp + geourl_process.cpp + geourl_process.hpp + gps_track_collection.cpp + gps_track_collection.hpp + gps_track_filter.cpp + gps_track_filter.hpp + gps_track_storage.cpp + gps_track_storage.hpp + gps_track.cpp + gps_track.hpp + gps_tracker.cpp + gps_tracker.hpp + mwm_url.cpp + mwm_url.hpp + place_page_info.cpp + place_page_info.hpp + track.cpp + track.hpp + user_mark_container.cpp + user_mark_container.hpp + user_mark.cpp + user_mark.hpp +) + +add_library(map ${SRC}) + +if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID) + include_directories( + ${Qt5OpenGL_LIBRARIES} + ) +endif() + +omim_add_test_subdirectory(mwm_tests) diff --git a/map/mwm_tests/CMakeLists.txt b/map/mwm_tests/CMakeLists.txt new file mode 100644 index 0000000000..653ec2810e --- /dev/null +++ b/map/mwm_tests/CMakeLists.txt @@ -0,0 +1,49 @@ +add_compile_options( + "-Wall" + "-std=c++11" +) + +set( + SRC + multithread_mwm_test.cpp + mwm_foreach_test.cpp + mwm_index_test.cpp +) + +omim_add_test(mwm_tests ${SRC}) +omim_link_libraries( + mwm_tests + map + search + storage + indexer + editor + platform + geometry + coding + base + opening_hours + freetype + fribidi + expat + oauthcpp + protobuf + tomcrypt + jansson + succinct + pugixml + stats_client + ${Qt5Core_LIBRARIES} + ${Qt5OpenGL_LIBRARIES} + ${LIBZ} +) + +if (PLATFORM_MAC) + omim_link_libraries( + mwm_tests + "-framework Cocoa" + "-framework IOKit" + "-framework QuartzCore" + "-framework SystemConfiguration" + ) +endif()