[Commits] Rev 4431: restore a cross-compiling bit that was lost in a merge in lp:~maria-captains/maria/5.5

Sergei Golubchik serg at mariadb.org
Tue Feb 10 16:08:01 EET 2015


At lp:~maria-captains/maria/5.5

------------------------------------------------------------
revno: 4431
revision-id: sergii at pisem.net-20150210091942-s9354vmb7uhmbsln
parent: sergii at pisem.net-20150209195336-0wes7aej18024843
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.5
timestamp: Tue 2015-02-10 10:19:42 +0100
message:
  restore a cross-compiling bit that was lost in a merge
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2014-12-19 10:35:44 +0000
+++ b/CMakeLists.txt	2015-02-10 09:19:42 +0000
@@ -350,6 +350,11 @@ MYSQL_CHECK_READLINE()
 
 CHECK_JEMALLOC()
 
+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 by the end. Platform checks are
 # not run with the warning options as to not perturb fragile checks



More information about the commits mailing list