summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Guerra Soto <fabian.guerra@mapbox.com>2019-03-25 09:25:08 -0700
committerGitHub <noreply@github.com>2019-03-25 09:25:08 -0700
commit10114c85bba9c2c0e62aa6361b887717f9f05921 (patch)
tree465807543f4353e3e0c388fb4ba482ceeb23f615
parent81c48bbca7044fd29b649dc3de1aba5c50b82a05 (diff)
downloadqtlocation-mapboxgl-10114c85bba9c2c0e62aa6361b887717f9f05921.tar.gz
[ios, macos, build] Remove DEBUG from logging configuration. (#13933)
* [ios, macos] Change the debug flag usage to NDEBUG. * [ios, macos] Add NDEBUG preprocessor macro to ios/macos project conf.
-rw-r--r--platform/darwin/src/MGLLoggingConfiguration.h2
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj2
-rw-r--r--platform/macos/macos.xcodeproj/project.pbxproj1
3 files changed, 4 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLLoggingConfiguration.h b/platform/darwin/src/MGLLoggingConfiguration.h
index 6782dc60a7..d79336df4c 100644
--- a/platform/darwin/src/MGLLoggingConfiguration.h
+++ b/platform/darwin/src/MGLLoggingConfiguration.h
@@ -4,7 +4,7 @@
#ifndef MGL_LOGGING_DISABLED
#ifndef MGL_LOGGING_ENABLE_DEBUG
- #ifdef DEBUG
+ #ifndef NDEBUG
#define MGL_LOGGING_ENABLE_DEBUG 1
#endif
#endif
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 535f83728f..a514f4a017 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -3862,6 +3862,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "$SRCROOT/src/Mapbox-Prefix.pch";
+ GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
HEADER_SEARCH_PATHS = (
"$(mbgl_core_INCLUDE_DIRECTORIES)",
"$(mbgl_filesource_INCLUDE_DIRECTORIES)",
@@ -4296,6 +4297,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "$SRCROOT/src/Mapbox-Prefix.pch";
+ GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
HEADER_SEARCH_PATHS = (
"$(mbgl_core_INCLUDE_DIRECTORIES)",
"$(mbgl_filesource_INCLUDE_DIRECTORIES)",
diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj
index 5d5a94c78a..57c4f198f0 100644
--- a/platform/macos/macos.xcodeproj/project.pbxproj
+++ b/platform/macos/macos.xcodeproj/project.pbxproj
@@ -2008,6 +2008,7 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_CPP_RTTI = NO;
GCC_NO_COMMON_BLOCKS = YES;
+ GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;