diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-06 13:16:49 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-06 13:16:49 +0100 |
| commit | bfcc62c748e0918d67c726c7a96d2cd04faba23c (patch) | |
| tree | 49110ac4734bd02544139992a7367ba71926d0c0 /server-tools | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| parent | 6ad448115bd829360145c865b659dfea65b12907 (diff) | |
| download | mariadb-git-bfcc62c748e0918d67c726c7a96d2cd04faba23c.tar.gz | |
merge
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | server-tools/instance-manager/CMakeLists.txt | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/server-tools/CMakeLists.txt b/server-tools/CMakeLists.txt index 9cfeb4e80f9..74b16c5feb1 100644 --- a/server-tools/CMakeLists.txt +++ b/server-tools/CMakeLists.txt @@ -13,8 +13,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") ADD_DEFINITIONS(-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/sql diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt index 813a07a6b1d..54389a6f3cc 100755 --- a/server-tools/instance-manager/CMakeLists.txt +++ b/server-tools/instance-manager/CMakeLists.txt @@ -14,8 +14,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") ADD_DEFINITIONS(-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/sql |