diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 09:47:28 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 09:47:28 +0300 |
commit | 365cd08345ab759308cfcac663a2a5880c0c33cb (patch) | |
tree | 53ef588edc5e01bd456784c12f1770f83a17cfb5 /dbug | |
parent | 675716e1cb34e29f7d3f46aac9a93adf02ac0851 (diff) | |
parent | 1dea7f79779d13695876b84ebecbf41c13d845cb (diff) | |
download | mariadb-git-365cd08345ab759308cfcac663a2a5880c0c33cb.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'dbug')
-rw-r--r-- | dbug/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index d45401be290..d938788aded 100644 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -30,7 +30,7 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) TARGET_LINK_LIBRARIES(factorial dbug) ENDIF() -IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode) +IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode AND NOT RPM AND NOT DEB) FIND_PROGRAM(GROFF groff) FIND_PROGRAM(NROFF nroff) MARK_AS_ADVANCED(GROFF) |