diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 00:13:15 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 00:23:14 +0200 |
commit | e813549942bcedf613910db54d9ce94f62ed349f (patch) | |
tree | f3f7429b098eb8162c0bbeb55c8eb9a63504b62f /sql/CMakeLists.txt | |
parent | 8fe927e6de88d93e22a097820558ba4296ce72a9 (diff) | |
download | mariadb-git-e813549942bcedf613910db54d9ce94f62ed349f.tar.gz |
Backport "Fix generation of bison output for out-of-source builds."to 10.5
Apply 115fec58f16d3c49 to 10.5
Diffstat (limited to 'sql/CMakeLists.txt')
-rw-r--r-- | sql/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index eb6f3d4dfdd..5719d098383 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -352,12 +352,13 @@ IF (NOT BISON_FOUND) MESSAGE(FATAL_ERROR ${ERRMSG}) ENDIF() ELSE() + CONFIGURE_FILE(myskel.m4.in myskel.m4) BISON_TARGET(gen_mariadb_cc_hh ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.yy ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.cc - COMPILE_FLAGS "-p MYSQL -S ${CMAKE_CURRENT_SOURCE_DIR}/myskel.m4") + COMPILE_FLAGS "-p MYSQL -S ${CMAKE_CURRENT_BINARY_DIR}/myskel.m4") BISON_TARGET(gen_oracle_cc_hh ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.yy ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.cc - COMPILE_FLAGS "-p ORA -S ${CMAKE_CURRENT_SOURCE_DIR}/myskel.m4") + COMPILE_FLAGS "-p ORA -S ${CMAKE_CURRENT_BINARY_DIR}/myskel.m4") ENDIF() IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) |