diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-02 10:25:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-02 10:25:11 +0300 |
| commit | 8300f639a14afeb379c224e10dab9d99d31cecbd (patch) | |
| tree | c67c0a5afc6062b99ec21194a99b81d3633f8c38 /CMakeLists.txt | |
| parent | 804761a844906c7f7bd11139a366a5dfc1d8bcd6 (diff) | |
| parent | 50641db2d11ad8a2228f7938d851e52decb71a9b (diff) | |
| download | mariadb-git-8300f639a14afeb379c224e10dab9d99d31cecbd.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8412e58b72c..e7c22af70e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7) IF(POLICY CMP0022) CMAKE_POLICY(SET CMP0022 NEW) ENDIF() +IF(POLICY CMP0048) + CMAKE_POLICY(SET CMP0048 NEW) +ENDIF() IF(POLICY CMP0054) CMAKE_POLICY(SET CMP0054 NEW) ENDIF() |