diff options
| author | Timofey <t.danshin@corp.mail.ru> | 2016-09-13 19:51:58 +0300 |
|---|---|---|
| committer | Timofey <t.danshin@corp.mail.ru> | 2016-09-28 18:58:24 +0300 |
| commit | ff855ad4133539dcc8a05e18fa0c0b318c65fb58 (patch) | |
| tree | bfbb8f0f41cb217cd61f11f50f5bfbd1361425ca /base | |
| parent | 2143577410e715b5867addfb97bb0fdc2c18b170 (diff) | |
Working on platform.
Diffstat (limited to 'base')
| -rw-r--r-- | base/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | base/base.hpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 5b02583869..32c4b83408 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -1,5 +1,3 @@ -add_subdirectory(base_tests) - set( SRC SRC_FIRST.hpp @@ -80,3 +78,5 @@ set( ) omim_add_library(base ${SRC}) + +add_subdirectory(base_tests) diff --git a/base/base.hpp b/base/base.hpp index 26e1289f1d..550dd538d6 100644 --- a/base/base.hpp +++ b/base/base.hpp @@ -2,14 +2,13 @@ #include "std/cstdint.hpp" -#if defined(DEBUG) || defined(_DEBUG) || defined(NRELEASE) || defined(QT_DEBUG) +#if defined(DEBUG) || defined(_DEBUG) || defined(NRELEASE) #define MY_DEBUG_DEFINED 1 #else #define MY_DEBUG_DEFINED 0 #endif -#if defined(RELEASE) || defined(_RELEASE) || defined(NDEBUG) || defined(_NDEBUG) || \ - defined(QT_NO_DEBUG) +#if defined(RELEASE) || defined(_RELEASE) || defined(NDEBUG) || defined(_NDEBUG) #define MY_RELEASE_DEFINED 1 #else #define MY_RELEASE_DEFINED 0 |