You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/03/16 17:46:58 UTC
[geode-native] branch develop updated: GEODE-4850: Update minimum
CMake version to 3.10 (#240)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 6070535 GEODE-4850: Update minimum CMake version to 3.10 (#240)
6070535 is described below
commit 60705358a0e777c24f6f3ee4e95fdb5e1ef50baf
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Mar 16 10:46:56 2018 -0700
GEODE-4850: Update minimum CMake version to 3.10 (#240)
- Update linux and solaris packers with CMake 3.10.3
- Update travis docker to CMake 3.10.3 and Geode to 1.4.0
---
BUILDING.md | 2 +-
CMakeLists.txt | 3 ++-
docker/Dockerfile | 22 +++++++++++++---------
packer/rhel/install-cmake.sh | 2 +-
packer/solaris/install-cmake.sh | 2 +-
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/BUILDING.md b/BUILDING.md
index 9aabe17..d00975e 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1,7 +1,7 @@
# Building
## Prerequisites (All Platforms)
-* [CMake 3.8](https://cmake.org/) or newer
+* [CMake 3.10](https://cmake.org/) or newer
* C++11 compiler *(see platform specific requirements)*
* [Doxygen 8.11](http://www.stack.nl/~dimitri/doxygen/download.html) *(for building source documentation)*
* [Apache Geode](http://geode.apache.org/releases/) binaries installed or available to link against
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8311f7c..a084fe0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,8 @@
# 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.4)
+
+cmake_minimum_required(VERSION 3.10)
project(nativeclient)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bd2b5f4..3589ddb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,18 +17,22 @@
FROM ubuntu
LABEL maintainer Apache Geode <de...@geode.apache.org>
-RUN \
- apt-get update \
- && apt-get install -y build-essential cmake doxygen git graphviz openjdk-8-jdk wget zlib1g-dev \
- && rm -rf /var/lib/apt/lists/*
+RUN apt-get update
+RUN apt-get install -y build-essential doxygen git graphviz openjdk-8-jdk wget zlib1g-dev
+RUN rm -rf /var/lib/apt/lists/*
-ENV GEODE_VERSION 1.1.0
-RUN \
- wget "https://www.apache.org/dyn/closer.cgi?action=download&filename=geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tar.gz" -O - | tar xzf -
+ENV GEODE_VERSION 1.4.0
+RUN wget "https://www.apache.org/dyn/closer.cgi?action=download&filename=geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz" -O - | \
+ tar xzf -
ENV RAT_VERSION 0.12
-RUN \
- wget "https://www.apache.org/dyn/closer.cgi?action=download&filename=creadur/apache-rat-${RAT_VERSION}/apache-rat-${RAT_VERSION}-bin.tar.gz2" -O - | tar xzf -
+RUN wget "https://www.apache.org/dyn/closer.cgi?action=download&filename=creadur/apache-rat-${RAT_VERSION}/apache-rat-${RAT_VERSION}-bin.tar.bz2" -O - | \
+ tar xjf -
+
+ENV CMAKE_VERSION 3.10.3
+RUN wget "https://cmake.org/files/LatestRelease/cmake-${CMAKE_VERSION}-Linux-x86_64.sh" -O /tmp/cmake && \
+ bash /tmp/cmake --skip-license --prefix=/usr/local && \
+ rm /tmp/cmake
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
ENV GEODE_HOME /apache-geode-${GEODE_VERSION}
diff --git a/packer/rhel/install-cmake.sh b/packer/rhel/install-cmake.sh
index 6170e01..88c9966 100644
--- a/packer/rhel/install-cmake.sh
+++ b/packer/rhel/install-cmake.sh
@@ -19,7 +19,7 @@ set -x -e -o pipefail
tmp=`mktemp`
-curl -o ${tmp} -v -L https://cmake.org/files/v3.5/cmake-3.5.0-Linux-x86_64.sh
+curl -o ${tmp} -v -L https://cmake.org/files/LatestRelease/cmake-3.10.3-Linux-x86_64.sh
bash ${tmp} --skip-license --prefix=/usr/local
diff --git a/packer/solaris/install-cmake.sh b/packer/solaris/install-cmake.sh
index d366cf6..064b5a1 100644
--- a/packer/solaris/install-cmake.sh
+++ b/packer/solaris/install-cmake.sh
@@ -22,7 +22,7 @@ source ~/.bashrc
NCPU=2
pushd `mktemp -d`
-wget -O - https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz | \
+wget -O - https://cmake.org/files/LatestRelease/cmake-3.10.3.tar.gz | \
gtar --strip-components=1 -zxf -
./bootstrap --system-curl --no-qt-gui --parallel=$NCPU -- -DBUILD_CursesDialog=off
gmake -j$NCPU
--
To stop receiving notification emails like this one, please contact
jbarrett@apache.org.