summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-05-26 11:22:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-05-26 11:22:40 +0300
commit860e754349646fb8ec8e9231a7fc09a5d4b7c247 (patch)
treed66c4b8a3c96e8e0d6e6ad9dfb12cdca750eb754 /CMakeLists.txt
parent71e1ddda220c2d452351fc6bf240cb0bad6ccf4a (diff)
parent365cd08345ab759308cfcac663a2a5880c0c33cb (diff)
downloadmariadb-git-860e754349646fb8ec8e9231a7fc09a5d4b7c247.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7072214ba23..d6cf989711d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,11 +123,13 @@ FOREACH(_base
ENDIF()
ENDFOREACH()
+IF(NOT RPM AND NOT DEB)
FOREACH(tool gtar tar)
STRING(TOUPPER ${tool} TOOL)
FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
ENDFOREACH()
+ENDIF()
FIND_PACKAGE(Git)