diff options
author | Vladislav Vaintroub <vv221804@astra04> | 2010-01-09 00:38:19 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vv221804@astra04> | 2010-01-09 00:38:19 +0100 |
commit | 4fbd5ccd71aaa3e6ddf09d3b44b3b2b20fc25798 (patch) | |
tree | 51859a8a01c56f1f7736401795d61d98e778f192 /cmake/make_dist.cmake.in | |
parent | 0f0e56b03ad13717ef34e816cb380a9ca61cdd2e (diff) | |
download | mariadb-git-4fbd5ccd71aaa3e6ddf09d3b44b3b2b20fc25798.tar.gz |
Address Kents comments: copy docs, remove autom4te.cache subdirectory if exists.
Diffstat (limited to 'cmake/make_dist.cmake.in')
-rw-r--r-- | cmake/make_dist.cmake.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index aae5bdbc666..13950e08553 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.in @@ -36,6 +36,8 @@ SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@") SET(CMAKE_MAKE_PROGRAM "@CMAKE_MAKE_PROGRAM@") SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@") +SET(MYSQL_DOCS_LOCATION "@MYSQL_DOCS_LOCATION@") + SET(PACKAGE_DIR ${CMAKE_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}) @@ -127,10 +129,16 @@ CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.h CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc ${PACKAGE_DIR}/sql/sql_yacc.cc COPYONLY) +# Add documentation, if user has specified where to find them +IF(MYSQL_DOCS_LOCATION) + MESSAGE("Copying documentation files from " ${MYSQL_DOCS_LOCATION}) + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_directory "${MYSQL_DOCS_LOCATION}" "${PACKAGE_DIR}") +ENDIF() # In case we used CPack, it could have copied some # extra files that are not usable on different machines. FILE(REMOVE ${PACKAGE_DIR}/CMakeCache.txt) +FILE(REMOVE_RECURSE ${PACKAGE_DIR}/autom4te.cache) # When packing source, prefer gnu tar to "cmake -P tar" # cmake does not preserve timestamps.gnuwin32 tar is broken, cygwin is ok |