diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-08-04 00:44:51 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-08-04 00:44:51 +0200 |
| commit | c4c200749a200a7e89ecc6d09c3c41941e0ff50e (patch) | |
| tree | 5e647c8d2eafbe6efdbb0d34399a6cd420049da2 /dbug | |
| parent | f2204146721cd2257ccc1f5954db680aa58b06ed (diff) | |
| parent | e31f5611aadf37fb7436de255120cbc8bcbb4fb5 (diff) | |
| download | mariadb-git-c4c200749a200a7e89ecc6d09c3c41941e0ff50e.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
libmysql/CMakeLists.txt:
merge fix
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) |