Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/3party
diff options
context:
space:
mode:
authorTimofey <t.danshin@corp.mail.ru>2016-11-09 16:41:35 +0300
committerTimofey <t.danshin@corp.mail.ru>2016-11-09 16:41:35 +0300
commit578e95bb1cf359a798260f41ad1025747629a11b (patch)
tree67789b00e9b859fbd477c6b978906a28b5b64dfc /3party
parent6ff505b2a8644fd12eb0aa82628b0366117d004c (diff)
Brought the 3party cmake lists to accordance with the project's style.
Diffstat (limited to '3party')
-rw-r--r--3party/jansson/CMakeLists.txt13
-rw-r--r--3party/liboauthcpp/CMakeLists.txt11
-rw-r--r--3party/minizip/CMakeLists.txt10
-rw-r--r--3party/protobuf/CMakeLists.txt18
-rw-r--r--3party/pugixml/CMakeLists.txt11
-rw-r--r--3party/succinct/CMakeLists.txt11
-rw-r--r--3party/tomcrypt/CMakeLists.txt10
7 files changed, 17 insertions, 67 deletions
diff --git a/3party/jansson/CMakeLists.txt b/3party/jansson/CMakeLists.txt
index 8594823bf7..17b20e92ee 100644
--- a/3party/jansson/CMakeLists.txt
+++ b/3party/jansson/CMakeLists.txt
@@ -1,15 +1,8 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(jansson C CXX)
+project(jansson)
include_directories(src ../../)
-add_compile_options(
- "-Wall"
- "-Wno-unused-function"
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+append(CMAKE_CXX_FLAGS "-std=c++11")
set(
@@ -35,4 +28,4 @@ set(
src/value.c
)
-add_library(jansson ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/liboauthcpp/CMakeLists.txt b/3party/liboauthcpp/CMakeLists.txt
index c0a86f5225..1236a7cda2 100644
--- a/3party/liboauthcpp/CMakeLists.txt
+++ b/3party/liboauthcpp/CMakeLists.txt
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(oauthcpp C CXX)
-
-add_compile_options(
- "-Wall"
- "-std=c++11"
-)
+project(oauthcpp)
include_directories(include src)
@@ -19,4 +12,4 @@ set(
src/liboauthcpp.cpp
)
-add_library(oauthcpp ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/minizip/CMakeLists.txt b/3party/minizip/CMakeLists.txt
index 7fad4f1c66..132fefaf56 100644
--- a/3party/minizip/CMakeLists.txt
+++ b/3party/minizip/CMakeLists.txt
@@ -1,10 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(minizip C CXX)
-
-add_compile_options(
- "-Wall"
-)
+project(minizip)
add_definitions(-DUSE_FILE32ZPI -DNOCRYPT)
@@ -18,4 +12,4 @@ set(
zip.h
)
-add_library(minizip ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/protobuf/CMakeLists.txt b/3party/protobuf/CMakeLists.txt
index 25463c597b..aef7d8c2cd 100644
--- a/3party/protobuf/CMakeLists.txt
+++ b/3party/protobuf/CMakeLists.txt
@@ -1,19 +1,11 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(protobuf C CXX)
+project(protobuf)
include_directories(. src ../../)
-add_compile_options(
- "-Wall"
- "-std=c++11"
-)
-
if (NOT PLATFORM_WIN)
add_definitions(-DHAVE_PTHREAD)
endif ()
-
set(
SRC
config.h
@@ -56,19 +48,17 @@ set(
)
if (PLATFORM_LINUX OR PLATFORM_ANDROID OR (PLATFORM_WIN AND NOT MSVC))
- set(
+ append(
SRC
- ${SRC}
src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
)
endif()
if (PLATFORM_WIN AND MSVC)
- set(
+ append(
SRC
- ${SRC}
src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
)
endif()
-add_library(protobuf ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/pugixml/CMakeLists.txt b/3party/pugixml/CMakeLists.txt
index 7d446af551..64be298433 100644
--- a/3party/pugixml/CMakeLists.txt
+++ b/3party/pugixml/CMakeLists.txt
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(pugixml C CXX)
-
-add_compile_options(
- "-Wall"
- "-std=c++11"
-)
+project(pugixml)
include_directories(src)
@@ -16,4 +9,4 @@ set(
src/pugiconfig.hpp
)
-add_library(pugixml ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/succinct/CMakeLists.txt b/3party/succinct/CMakeLists.txt
index f04e33b210..30ee3eedf5 100644
--- a/3party/succinct/CMakeLists.txt
+++ b/3party/succinct/CMakeLists.txt
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(succinct C CXX)
-
-add_compile_options(
- "-Wall"
- "-std=c++11"
-)
+project(succinct)
add_definitions(-DLTC_NO_ROLC)
@@ -38,4 +31,4 @@ set(
vbyte.hpp
)
-add_library(succinct ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/tomcrypt/CMakeLists.txt b/3party/tomcrypt/CMakeLists.txt
index b78407ef83..7bf82e9bb8 100644
--- a/3party/tomcrypt/CMakeLists.txt
+++ b/3party/tomcrypt/CMakeLists.txt
@@ -1,10 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(tomcrypt C CXX)
-
-add_compile_options(
- "-Wall"
-)
+project(tomcrypt)
add_definitions(-DLTC_NO_ROLC)
@@ -20,4 +14,4 @@ set(
src/misc/crypt/crypt_argchk.c
)
-add_library(tomcrypt ${SRC})
+add_library(${PROJECT_NAME} ${SRC})