diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-08 22:01:45 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-08 22:02:28 +0200 |
| commit | 115fec58f16d3c49a4507a81725c5ff969bf6af4 (patch) | |
| tree | 96423bf1300bfc451201a5a61d422790826930d4 /sql/CMakeLists.txt | |
| parent | 78084fa747f373f2b404c3cb543d19f439100d9e (diff) | |
| download | mariadb-git-115fec58f16d3c49a4507a81725c5ff969bf6af4.tar.gz | |
Fix generation of bison output for out-of-source builds.
Make sure the #line directives contain existing source file sql_yacc.yy.
Before the patch #line directive would point out to non-existing path in
current build directory.
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 906c9d30bc9..c50229ada1e 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -356,12 +356,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) |