| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 796464015bffe6e0beca9e1c355b223512803c3e Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Wed, 27 Feb 2019 23:01:00 -0800 |
| 4 | Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found |
| 5 | |
| 6 | Fix the below do_compile issue in cross-compiling env. |
| 7 | | make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_hash', needed by 'sql/lex_hash.h'. Stop. |
| 8 | | make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_token', needed by 'sql/lex_token.h'. Stop. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [oe build specific] |
| 11 | |
| 12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 13 | |
| 14 | --- |
| 15 | sql/CMakeLists.txt | 30 ++++++++++++++++++++---------- |
| 16 | 1 file changed, 20 insertions(+), 10 deletions(-) |
| 17 | |
| 18 | diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt |
| 19 | index c6910f46..bf51f4cb 100644 |
| 20 | --- a/sql/CMakeLists.txt |
| 21 | +++ b/sql/CMakeLists.txt |
| 22 | @@ -50,11 +50,16 @@ ${WSREP_INCLUDES} |
| 23 | |
| 24 | |
| 25 | |
| 26 | -ADD_CUSTOM_COMMAND( |
| 27 | - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h |
| 28 | - COMMAND gen_lex_token > lex_token.h |
| 29 | - DEPENDS gen_lex_token |
| 30 | -) |
| 31 | +IF(NOT CMAKE_CROSSCOMPILING) |
| 32 | + ADD_CUSTOM_COMMAND( |
| 33 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h |
| 34 | + COMMAND gen_lex_token > lex_token.h |
| 35 | + DEPENDS gen_lex_token) |
| 36 | +ELSE() |
| 37 | + ADD_CUSTOM_COMMAND( |
| 38 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h |
| 39 | + COMMAND gen_lex_token > lex_token.h) |
| 40 | +ENDIF() |
| 41 | |
| 42 | ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER) |
| 43 | |
| 44 | @@ -370,11 +375,16 @@ IF(NOT CMAKE_CROSSCOMPILING) |
| 45 | ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) |
| 46 | ENDIF() |
| 47 | |
| 48 | -ADD_CUSTOM_COMMAND( |
| 49 | - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h |
| 50 | - COMMAND gen_lex_hash > lex_hash.h |
| 51 | - DEPENDS gen_lex_hash |
| 52 | -) |
| 53 | +IF(NOT CMAKE_CROSSCOMPILING) |
| 54 | + ADD_CUSTOM_COMMAND( |
| 55 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h |
| 56 | + COMMAND gen_lex_hash > lex_hash.h |
| 57 | + DEPENDS gen_lex_hash) |
| 58 | +ELSE() |
| 59 | + ADD_CUSTOM_COMMAND( |
| 60 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h |
| 61 | + COMMAND gen_lex_hash > lex_hash.h) |
| 62 | +ENDIF() |
| 63 | |
| 64 | MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc COMPONENT Server) |
| 65 | SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") |