diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-28 12:52:41 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-09-30 17:01:05 +0200 |
| commit | b470a655825ae3b805734aae3e1d49b9014a7be0 (patch) | |
| tree | 45392d51c58110336e6f169a1c923581e2c8872f /CMakeLists.txt | |
| parent | d4888cb39d0c52e23068b579af6beeb04ecb5714 (diff) | |
| download | qtlocation-mapboxgl-b470a655825ae3b805734aae3e1d49b9014a7be0.tar.gz | |
[build] add back -Werror
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 84ea8dddb7..79c85829e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,10 +26,10 @@ mason_use(boost VERSION 1.60.0 HEADER_ONLY) mason_use(geojsonvt VERSION 6.1.3 HEADER_ONLY) mason_use(supercluster VERSION 0.2.0 HEADER_ONLY) mason_use(kdbush VERSION 0.1.1 HEADER_ONLY) -mason_use(earcut VERSION 0.11 HEADER_ONLY) +mason_use(earcut VERSION 0.12.1 HEADER_ONLY) mason_use(protozero VERSION 1.4.2 HEADER_ONLY) -mason_use(pixelmatch VERSION 0.9.0 HEADER_ONLY) -mason_use(geojson VERSION 0.3.1 HEADER_ONLY) +mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY) +mason_use(geojson VERSION 0.3.2 HEADER_ONLY) if(WITH_COVERAGE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage") @@ -37,7 +37,12 @@ if(WITH_COVERAGE) endif(WITH_COVERAGE) set(CMAKE_CONFIGURATION_TYPES Debug Release) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wshadow -Wno-variadic-macros -Wno-unknown-pragmas") + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wshadow -Werror -Wno-variadic-macros -Wno-unknown-pragmas") +if(APPLE) + # -Wno-error=unused-command-line-argument is required due to https://llvm.org/bugs/show_bug.cgi?id=7798 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") +endif() if(NOT EXISTS ${CMAKE_SOURCE_DIR}/platform/${MBGL_PLATFORM}/config.cmake) message(ERROR "Can't find config.cmake file for platform ${MBGL_PLATFORM}") |