Lines 1-6
Link Here
|
1 |
--- CMakeLists.txt.orig 2018-03-11 14:00:07 UTC |
1 |
--- CMakeLists.txt.orig 2018-08-11 08:14:55 UTC |
2 |
+++ CMakeLists.txt |
2 |
+++ CMakeLists.txt |
3 |
@@ -69,6 +69,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug |
3 |
@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug |
4 |
# Used for some Linux distributions which do not provide the polyclipping lib. |
4 |
# Used for some Linux distributions which do not provide the polyclipping lib. |
5 |
option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF) |
5 |
option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF) |
6 |
|
6 |
|
Lines 12-18
Link Here
|
12 |
option(Mapper_USE_GDAL "Use the GDAL library" ON) |
12 |
option(Mapper_USE_GDAL "Use the GDAL library" ON) |
13 |
|
13 |
|
14 |
if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo) |
14 |
if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo) |
15 |
@@ -227,10 +232,20 @@ endif() |
15 |
@@ -231,10 +236,20 @@ endif() |
16 |
|
16 |
|
17 |
# Subdirectories |
17 |
# Subdirectories |
18 |
|
18 |
|
Lines 36-42
Link Here
|
36 |
add_subdirectory("3rd-party/qbezier") |
36 |
add_subdirectory("3rd-party/qbezier") |
37 |
if(NOT ANDROID) |
37 |
if(NOT ANDROID) |
38 |
add_subdirectory("3rd-party/qtsingleapplication") |
38 |
add_subdirectory("3rd-party/qtsingleapplication") |
39 |
@@ -250,7 +265,7 @@ if(CMAKE_CROSSCOMPILING) |
39 |
@@ -254,7 +269,7 @@ if(CMAKE_CROSSCOMPILING) |
40 |
add_custom_target(TEST_WARNING ALL |
40 |
add_custom_target(TEST_WARNING ALL |
41 |
COMMENT "Crosscompiling, skipping all tests") |
41 |
COMMENT "Crosscompiling, skipping all tests") |
42 |
add_dependencies(TEST_WARNING Mapper) |
42 |
add_dependencies(TEST_WARNING Mapper) |