diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-08-03 22:57:21 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-08-03 22:57:21 +0200 |
| commit | 6f43cf82c8ebe9e7851bd9409fd3db6c84e17ef5 (patch) | |
| tree | fb563e643d6b42feb801c036272d89d964b5ed48 /dbug | |
| parent | 97bb72f139b95cf2ecd2c8ed0ac9a3b449ef8977 (diff) | |
| parent | 29bd01e6c11c0d9df7f556f157b1b00e06306f60 (diff) | |
| download | mariadb-git-6f43cf82c8ebe9e7851bd9409fd3db6c84e17ef5.tar.gz | |
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
BitKeeper/deleted/.del-README~1:
SCCS merged
BitKeeper/deleted/.del-configure.js:
ul
dbug/CMakeLists.txt:
SCCS merged
extra/CMakeLists.txt:
SCCS merged
extra/yassl/CMakeLists.txt:
SCCS merged
extra/yassl/taocrypt/CMakeLists.txt:
SCCS merged
scripts/CMakeLists.txt:
SCCS merged
server-tools/instance-manager/CMakeLists.txt:
SCCS merged
sql/CMakeLists.txt:
SCCS merged
storage/myisam/CMakeLists.txt:
SCCS merged
Diffstat (limited to 'dbug')
| -rwxr-xr-x | dbug/CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index 34f44f9a720..8b27f79dcf4 100755 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -13,7 +13,12 @@ # 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_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbug) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) -ADD_LIBRARY(dbug dbug.c factorial.c sanity.c) +SET(DBUG_SOURCES dbug.c factorial.c sanity.c) + +IF(NOT SOURCE_SUBLIBS) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + ADD_LIBRARY(dbug ${DBUG_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) |