From 0e767f0e1b6d2f644d493c929fbef94f788d6ebd Mon Sep 17 00:00:00 2001 From: ZhiShen <39088547+xiaohu4313888@users.noreply.github.com> Date: Tue, 28 Sep 2021 14:00:03 +0800 Subject: [PATCH] Change cmake version (#8666) Change cmake version from 3.16 to 3.18 1. Change the CMakeList's minimum require version. 2. Change the describtion document of cmake version. Resolves: milvus-io#8407 Signed-off-by: Shen Zhi --- README.md | 2 +- internal/core/CMakeLists.txt | 2 +- internal/core/src/index/CMakeLists.txt | 2 +- internal/kv/rocksdb/cwrapper/CMakeLists.txt | 2 +- internal/storage/cwrapper/CMakeLists.txt | 2 +- internal/util/dablooms/cwrapper/CMakeLists.txt | 2 +- scripts/README.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9243f2b35..3ef59c5ec 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ Check the requirements first. ```bash go: 1.15 -cmake: >=3.16 +cmake: >=3.18 gcc: 7.5 ``` diff --git a/internal/core/CMakeLists.txt b/internal/core/CMakeLists.txt index c84ae20fd..16f614388 100644 --- a/internal/core/CMakeLists.txt +++ b/internal/core/CMakeLists.txt @@ -11,7 +11,7 @@ # or implied. See the License for the specific language governing permissions and limitations under the License. #------------------------------------------------------------------------------- -cmake_minimum_required( VERSION 3.14 ) +cmake_minimum_required( VERSION 3.18 ) add_definitions(-DELPP_THREAD_SAFE) set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/internal/core/src/index/CMakeLists.txt b/internal/core/src/index/CMakeLists.txt index 2f3d4e166..54a08eaf2 100644 --- a/internal/core/src/index/CMakeLists.txt +++ b/internal/core/src/index/CMakeLists.txt @@ -11,7 +11,7 @@ # or implied. See the License for the specific language governing permissions and limitations under the License. #------------------------------------------------------------------------------- -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.18) message(STATUS "------------------------------KNOWHERE-----------------------------------") message(STATUS "Building using CMake version: ${CMAKE_VERSION}") diff --git a/internal/kv/rocksdb/cwrapper/CMakeLists.txt b/internal/kv/rocksdb/cwrapper/CMakeLists.txt index afaac8100..a3c1f8ce0 100644 --- a/internal/kv/rocksdb/cwrapper/CMakeLists.txt +++ b/internal/kv/rocksdb/cwrapper/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14...3.17 FATAL_ERROR) +cmake_minimum_required( VERSION 3.18 ) project(wrapper) set(CMAKE_CXX_STANDARD 17) diff --git a/internal/storage/cwrapper/CMakeLists.txt b/internal/storage/cwrapper/CMakeLists.txt index c49896dda..787b83f2c 100644 --- a/internal/storage/cwrapper/CMakeLists.txt +++ b/internal/storage/cwrapper/CMakeLists.txt @@ -9,7 +9,7 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. -cmake_minimum_required(VERSION 3.14...3.17 FATAL_ERROR) +cmake_minimum_required( VERSION 3.18 ) project(wrapper) set(CMAKE_CXX_STANDARD 17) diff --git a/internal/util/dablooms/cwrapper/CMakeLists.txt b/internal/util/dablooms/cwrapper/CMakeLists.txt index f9daa06f7..1dff0cd5f 100644 --- a/internal/util/dablooms/cwrapper/CMakeLists.txt +++ b/internal/util/dablooms/cwrapper/CMakeLists.txt @@ -9,7 +9,7 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. -cmake_minimum_required(VERSION 3.14...3.17 FATAL_ERROR) +cmake_minimum_required( VERSION 3.18 ) project(dablooms) set(CMAKE_CXX_STANDARD 17) diff --git a/scripts/README.md b/scripts/README.md index e62c862dc..8f9b9eacc 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -5,7 +5,7 @@ ``` OS: Ubuntu 18.04 go：1.15 - cmake: >=3.16 + cmake: >=3.18 gcc： 7.5 ``` -- GitLab