diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
| commit | 8e80f91fa3e584d6b681bfbb4664e80a255af866 (patch) | |
| tree | af4f13f6f0290ee72b33a0642aa7c03e4e5fcd1c /cmake/make_dist.cmake.in | |
| parent | 63108dc9d2cc9f31ae9927817652be465a17f767 (diff) | |
| parent | 3ee8aa216d55b858ba9e53874359dcac9a82933a (diff) | |
| download | mariadb-git-8e80f91fa3e584d6b681bfbb4664e80a255af866.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42
Diffstat (limited to 'cmake/make_dist.cmake.in')
| -rw-r--r-- | cmake/make_dist.cmake.in | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index b8c8877ef61..c561baaa415 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.in @@ -22,7 +22,6 @@ SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@") SET(CPACK_SOURCE_PACKAGE_FILE_NAME "@CPACK_SOURCE_PACKAGE_FILE_NAME@") SET(CMAKE_CPACK_COMMAND "@CMAKE_CPACK_COMMAND@") SET(CMAKE_COMMAND "@CMAKE_COMMAND@") -SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@") SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@") SET(GTAR_EXECUTABLE "@GTAR_EXECUTABLE@") SET(TAR_EXECUTABLE "@TAR_EXECUTABLE@") @@ -53,22 +52,8 @@ IF(GIT_EXECUTABLE) ENDIF() ENDIF() -IF(BZR_EXECUTABLE AND NOT GIT_EXECUTABLE) - MESSAGE(STATUS "Running bzr export") - EXECUTE_PROCESS( - COMMAND "${BZR_EXECUTABLE}" export - ${PACKAGE_DIR} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - RESULT_VARIABLE RESULT - ) - - IF(NOT RESULT EQUAL 0) - SET(BZR_EXECUTABLE) - ENDIF() -ENDIF() - -IF(NOT BZR_EXECUTABLE AND NOT GIT_EXECUTABLE) - MESSAGE(STATUS "bzr not found or source dir is not a repo, use CPack") +IF(NOT GIT_EXECUTABLE) + MESSAGE(STATUS "git not found or source dir is not a repo, use CPack") IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) # In-source build is the worst option, we have to cleanup source tree. |