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 /sql | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| parent | 6ad448115bd829360145c865b659dfea65b12907 (diff) | |
| download | mariadb-git-bfcc62c748e0918d67c726c7a96d2cd04faba23c.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rwxr-xr-x | sql/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | sql/examples/CMakeLists.txt | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 7e8484eeb50..9ba6bd1e1b4 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -14,11 +14,7 @@ # 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 -DUSE_SYMDIR /Zi") -SET(CMAKE_C_FLAGS_DEBUG - "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi") -SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}") +ADD_DEFINITIONS(-DUSE_SYMDIR) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/yassl/include diff --git a/sql/examples/CMakeLists.txt b/sql/examples/CMakeLists.txt index 1a22e9a3efd..47a64c88c68 100755 --- a/sql/examples/CMakeLists.txt +++ b/sql/examples/CMakeLists.txt @@ -13,9 +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") - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/extra/yassl/include ${CMAKE_SOURCE_DIR}/regex) |