diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-08-03 11:22:01 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 131cd8a547dcffc81c39568efcd70aa190f16062 (patch) | |
| tree | 0351e33ef70350c4da8fbdb17d9587877990cd27 | |
| parent | 94ceeb739dcd71c826a18d53a739da326a81756a (diff) | |
| download | qtlocation-mapboxgl-131cd8a547dcffc81c39568efcd70aa190f16062.tar.gz | |
[build] Fix Qt4 build on OS X
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | cmake/mbgl.cmake | 2 | ||||
| -rw-r--r-- | platform/macos/config.cmake | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -328,7 +328,12 @@ endif #### Qt targets ##################################################### +ifeq ($(WITH_QT_4), 1) +QT_ROOT_PATH = build/qt4-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) +else QT_ROOT_PATH = build/qt-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) +endif + export QT_OUTPUT_PATH = $(QT_ROOT_PATH)/$(BUILDTYPE) QT_BUILD = $(QT_OUTPUT_PATH)/build.ninja diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 752f05619c..c73127ab3f 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -45,8 +45,6 @@ endfunction() # Start a new file when we're running CMake file(WRITE "${CMAKE_BINARY_DIR}/config.xcconfig" "// Do not edit -- generated by CMake\n") -set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10) - # CMake 3.1 does not have this yet. set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14") diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index b9f18635c1..30e2f81523 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -1,3 +1,5 @@ +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11) + mason_use(glfw VERSION 3.1.2) mason_use(boost_libprogram_options VERSION 1.60.0) mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) |