Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 09:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

base: Bump CMake for improved add_custom_command

Browse Source 
Improves cross-compilation support in add_custom_command by integrating

  https://gitlab.kitware.com/cmake/cmake/merge_requests/217

CMake Git master from 2016-11-03 (3.8-master).

Addresses #54
This commit is contained in:
Matt McCormick 2016-11-03 12:35:22 -04:00
parent ee2c1618c3
commit b3feda218b
No known key found for this signature in database
GPG Key ID: 45DA982347954FA5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common.docker
View File

@ -5,10 +5,20 @@ RUN git clone "https://github.com/nojhan/liquidprompt.git" && \
COPY imagefiles/.bashrc /root/ COPY imagefiles/.bashrc /root/
WORKDIR /usr/src WORKDIR /usr/src
RUN curl -O https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz && \ RUN git clone git://cmake.org/cmake.git CMake && \
tar xzf cmake-3.6.2-Linux-x86_64.tar.gz && \ cd CMake && \
cp -a cmake-3.6.2-Linux-x86_64/* /usr/ && \ git checkout ab2ae4823c3b60347825da4b851cd4e676f8bed1 && \
rm -rf cmake-3.6.2-Linux-x86_64 mkdir /usr/src/CMake-build && \
cd /usr/src/CMake-build && \
/usr/src/CMake/bootstrap \
--parallel=$(grep -c processor /proc/cpuinfo) \
--prefix=/usr && \
make -j$(grep -c processor /proc/cpuinfo) && \
./bin/cmake \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_USE_OPENSSL:BOOL=ON . && \
make install && \
cd .. && rm -rf CMake*
RUN git clone "https://github.com/martine/ninja.git" && \ RUN git clone "https://github.com/martine/ninja.git" && \
cd ninja && \ cd ninja && \