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 /scripts/CMakeLists.txt | |
| parent | a3e3225cd3b816d47621e749e21a71b6a864a96a (diff) | |
| parent | 3f8df01194700a68a62e6adbc62bd48d27dfe833 (diff) | |
| download | mariadb-git-5c76e1e6931d83dce971aafc281e8525e01de9f8.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'scripts/CMakeLists.txt')
| -rw-r--r-- | scripts/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index a689e6dc057..7d1f10e5ba2 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -28,14 +28,14 @@ MACRO(INSTALL_LINK old new destination component) ) ENDMACRO() -IF(NOT CMAKE_CROSSCOMPILING) +IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_EXECUTABLE(comp_sql comp_sql.c ../sql/sql_bootstrap.cc) TARGET_LINK_LIBRARIES(comp_sql) ENDIF() # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts) -IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) +IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)) FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable") MARK_AS_ADVANCED(CAT_EXECUTABLE) ENDIF() |