diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-15 20:21:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-15 20:21:11 +0300 |
| commit | 5c76e1e6931d83dce971aafc281e8525e01de9f8 (patch) | |
| tree | bc7c9be0dfcb9201e8c1dcfad9f40283f6eb8c2a /sql/CMakeLists.txt | |
| parent | a3e3225cd3b816d47621e749e21a71b6a864a96a (diff) | |
| parent | 3f8df01194700a68a62e6adbc62bd48d27dfe833 (diff) | |
| download | mariadb-git-5c76e1e6931d83dce971aafc281e8525e01de9f8.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 6b83cbcc01e..b172059373c 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -355,7 +355,7 @@ ELSE() COMPILE_FLAGS "-p ORA") ENDIF() -IF(NOT CMAKE_CROSSCOMPILING) +IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh) ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) @@ -405,7 +405,7 @@ ADD_CUSTOM_TARGET(distclean ) # Install initial database (default on windows, optional target elsewhere) -IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING) +IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)) IF(GENERATOR_IS_MULTI_CONFIG) SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR}) ENDIF() |