diff options
author | Jared Adams <jaxad0127@gmail.com> | 2010-08-03 11:43:34 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-03 11:43:34 -0600 |
commit | 94f91a5fd9f3f609e93224fe71d2a3bcce1c0866 (patch) | |
tree | 3541e3e91bca871cfa5e4cf395d35957d8f7c5cf /src/CMakeLists.txt | |
parent | 71ea8233334803a079ad24396ead02280a80d8d4 (diff) | |
parent | 98abc793f8fb45d647e1e8c51cf5f38170c6b703 (diff) | |
download | mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.tar.gz mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.tar.bz2 mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.tar.xz mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.zip |
Merge remote branch 'origin/1.0'
Conflicts:
src/net/tmwa/chathandler.cpp
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b2e0381..9e4d43e3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,8 +32,8 @@ ENDIF() IF (CMAKE_BUILD_TYPE) STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - IF((CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) OR - (CMAKE_BUILD_TYPE_TOLOWER MATCHES relwithdebinfo)) + IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug OR + CMAKE_BUILD_TYPE_TOLOWER MATCHES relwithdebinfo) SET(FLAGS "${FLAGS} -DDEBUG") ENDIF() ENDIF() |