diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-23 17:06:26 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-23 17:06:26 +0400 |
| commit | ab3d1c0d3185363f9fb488c5efd27c5ff5ab0878 (patch) | |
| tree | 2dc428d602a29f89bbc4c2c77033755a845fb5f2 /cmake | |
| parent | 39668e61bade1c4dc6ae2a10f7f78c67f9e2a02d (diff) | |
| parent | b3a11e66a73f4cacc2f48bec8d51efa27bb4b07b (diff) | |
| download | mariadb-git-ab3d1c0d3185363f9fb488c5efd27c5ff5ab0878.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_source_ignore_files.cmake | 1 | ||||
| -rw-r--r-- | cmake/make_dist.cmake.in | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/cmake/cpack_source_ignore_files.cmake b/cmake/cpack_source_ignore_files.cmake index 291990639d8..5eef20dccc6 100644 --- a/cmake/cpack_source_ignore_files.cmake +++ b/cmake/cpack_source_ignore_files.cmake @@ -36,6 +36,5 @@ include/config\\\\.h$ include/my_config\\\\.h$ /autom4te\\\\.cache/ errmsg\\\\.sys$ -storage/ndb/ # ) diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index 6b667e12416..13950e08553 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.in @@ -53,8 +53,6 @@ IF(BZR_EXECUTABLE) RESULT_VARIABLE RESULT ) - FILE(REMOVE_RECURSE ${PACKAGE_DIR}/storage/ndb) - IF(NOT RESULT EQUAL 0) SET(BZR_EXECUTABLE) ENDIF() |