From c2141701f8c022021f99507b6cfdf7ca2c00e939 Mon Sep 17 00:00:00 2001 From: Sambitesh Dash Date: Thu, 19 Oct 2017 14:34:31 -0700 Subject: [PATCH] Bump ORCA patch version and update README and conan.py for cmake version Signed-off-by: Ekta Khanna --- README.md | 2 +- concourse/conanfile.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fb3eecf635..18fa183d57 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Want to [Contribute](#contribute)? GPORCA supports various build types: debug, release with debug info, release. On x86 systems, GPORCA can also be built as a 32-bit or 64-bit library. You'll -need CMake 3.0 or higher to build GPORCA. Get it from cmake.org, or your +need CMake 3.1 or higher to build GPORCA. Get it from cmake.org, or your operating system's package manager. # First Time Setup diff --git a/concourse/conanfile.py b/concourse/conanfile.py index bde917c7b4..5810265860 100644 --- a/concourse/conanfile.py +++ b/concourse/conanfile.py @@ -33,10 +33,11 @@ class OrcaConan(ConanFile): try: vers = subprocess.check_output(["cmake", "--version"]).split()[2] if int(vers.split(".")[0]) < 3: - raise Exception("CMake version 3.0 or higher is required") + if int(vers.split(".")[1]) < 1: + raise Exception("CMake version 3.1 or higher is required") except OSError as e: if e.errno == os.errno.ENOENT: - raise Exception("CMake is not found. Please ensure the CMake 3.0 or later is installed") + raise Exception("CMake is not found. Please ensure the CMake 3.1 or later is installed") else: raise -- GitLab