diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
| commit | d7e7862364ae344fea5657eb5aae9db3fbb84553 (patch) | |
| tree | 38f30e541f98dae9092a09cf030de8f2a336bfd1 /CMakeLists.txt | |
| parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
| parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
| download | mariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ca9c0b6bf7..c7f07d93add 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,6 +362,11 @@ CHECK_JEMALLOC() CHECK_PCRE() +IF(CMAKE_CROSSCOMPILING) + SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") + INCLUDE(${IMPORT_EXECUTABLES}) +ENDIF() + # # Setup maintainer mode options. Platform checks are # not run with the warning options as to not perturb fragile checks @@ -452,7 +457,8 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc) CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) + ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in + ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) IF(DEB) CONFIGURE_FILE( @@ -464,7 +470,7 @@ ENDIF(DEB) INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake) # Source: This can be done during the cmake phase, all information is # available, but should be repeated on each "make" just in case someone -# does "cmake ; make ; bzr pull ; make". +# does "cmake ; make ; git pull ; make". CREATE_INFO_SRC(${CMAKE_BINARY_DIR}/Docs) ADD_CUSTOM_TARGET(INFO_SRC ALL COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_src.cmake |