MDEV-6410 Cross-compile fixes

https://code.launchpad.net/~chewi/maria/mysql-fix-bug61340/+merge/217351

.bzrignore

@@ -1459,3 +1459,4 @@ libmysql/libmysql_versions.ld
 scripts/mysql_config.pl
 pcre/pcre_chartables.c
 pcre/test*grep
+import_executables.cmake

CMakeLists.txt

@@ -386,6 +386,11 @@ ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO")
   SET(CMAKE_CXX_FLAGS_DEBUG "${MY_MAINTAINER_CXX_WARNINGS} ${CMAKE_CXX_FLAGS_DEBUG}")
 ENDIF()
 
+IF(CMAKE_CROSSCOMPILING)
+  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+  INCLUDE(${IMPORT_EXECUTABLES})
+ENDIF()
+
 IF(WITH_UNIT_TESTS)
  ENABLE_TESTING()
  ADD_SUBDIRECTORY(unittest/mytap)
@@ -451,6 +456,13 @@ IF(WIN32)
 ENDIF()
 ADD_SUBDIRECTORY(packaging/solaris)
 
+IF(NOT CMAKE_CROSSCOMPILING)
+  SET(EXPORTED comp_err comp_sql factorial gen_lex_hash)
+  # minimal target to build only binaries for export
+  ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
+  EXPORT(TARGETS ${EXPORTED} FILE ${CMAKE_BINARY_DIR}/import_executables.cmake)
+ENDIF()
+
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
 CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in

dbug/CMakeLists.txt

@@ -24,8 +24,10 @@ TARGET_LINK_LIBRARIES(dbug mysys)
 ADD_EXECUTABLE(tests tests.c)
 TARGET_LINK_LIBRARIES(tests dbug)
 
-ADD_EXECUTABLE(factorial my_main.c factorial.c)
-TARGET_LINK_LIBRARIES(factorial dbug)
+IF(NOT CMAKE_CROSSCOMPILING)
+  ADD_EXECUTABLE(factorial my_main.c factorial.c)
+  TARGET_LINK_LIBRARIES(factorial dbug)
+ENDIF()
 
 IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode)
   FIND_PROGRAM(GROFF groff)
@@ -36,11 +38,11 @@ IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode)
   SET(SOURCE_INC factorial.r main.r example1.r example2.r example3.r)
   ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT_INC}
                      DEPENDS factorial
-                     COMMAND ./factorial 1 2 3 4 5 > output1.r
-                     COMMAND ./factorial -\#t:o 2 3 > output2.r
-                     COMMAND ./factorial -\#d:t:o 3 > output3.r
-                     COMMAND ./factorial -\#d,result:o 4 > output4.r
-                     COMMAND ./factorial -\#d:f,factorial:F:L:o 3 > output5.r)
+                     COMMAND factorial 1 2 3 4 5 > output1.r
+                     COMMAND factorial -\#t:o 2 3 > output2.r
+                     COMMAND factorial -\#d:t:o 3 > output3.r
+                     COMMAND factorial -\#d,result:o 4 > output4.r
+                     COMMAND factorial -\#d:f,factorial:F:L:o 3 > output5.r)
   FOREACH(file ${SOURCE_INC})
     STRING(REGEX REPLACE "\\.r" ".c" srcfile ${file})
     ADD_CUSTOM_COMMAND(OUTPUT ${file} DEPENDS ${srcfile}

sql/CMakeLists.txt

@@ -218,7 +218,9 @@ RUN_BISON(
 )
 
 # Gen_lex_hash
-ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+IF(NOT CMAKE_CROSSCOMPILING)
+  ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+ENDIF()
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h