mirror of https://github.com/CGAL/cgal
Merge pull request #5743 from sloriot/CGAL-remove_last_setup.exe
remove remaining mentions to setup.exe
This commit is contained in:
commit
a391081a61
|
|
@ -89,8 +89,8 @@ solution, and we recommend to use them.
|
|||
These libraries can be obtained from <A HREF="https://gmplib.org/">`https://gmplib.org/`</A>
|
||||
and <A HREF="https://www.mpfr.org/">`https://www.mpfr.org/`</A>.
|
||||
Since Visual \cpp is not properly supported by the \gmp and \mpfr projects,
|
||||
we provide precompiled versions of \gmp and \mpfr, which can be downloaded with the installer
|
||||
<a href="https://github.com/CGAL/cgal/releases">`CGAL-\cgalReleaseNumber``-Setup.exe`</a>.
|
||||
we provide precompiled versions of \gmp and \mpfr, which can be downloaded
|
||||
from the <a href="https://github.com/CGAL/cgal/releases">assets of a release</a>.
|
||||
|
||||
\section secoptional3rdpartysoftware Optional Third Party Libraries
|
||||
|
||||
|
|
|
|||
|
|
@ -190,17 +190,6 @@ as this will help `cmake` to find Boost.</li>
|
|||
<li>Add the path to the Boost `dlls` (`C:\dev\libboost_1_71_0\lib64-msvc-XX.Y`) files to the `PATH` environment variable.</li>
|
||||
</ul>
|
||||
|
||||
\subsection ssect-installer-install-cgal Installing CGAL Itself
|
||||
|
||||
Download and run `CGAL-\cgalReleaseNumber``-Setup.exe` from
|
||||
<a href="https://www.cgal.org/download/windows.html">https://www.cgal.org/download/windows.html</a>.
|
||||
It is a self extracting executable that downloads the \cgal header files, and optionally the source code of the
|
||||
examples and demos. Additionally, it can download the precompiled versions of \gmp and \mpfr. You must
|
||||
specify if you want the 32 or the 64 bit versions of these two libraries.
|
||||
|
||||
Setting the environment variable `CGAL_DIR` to `C:\dev\CGAL-\cgalReleaseNumber` is a good idea
|
||||
to help `cmake` to find \cgal during the configuration process, detailed in the next section.
|
||||
|
||||
\subsection ssect-installer-compile-example Compiling an Example
|
||||
|
||||
We assume that you have downloaded the examples with the \cgal Installer.
|
||||
|
|
|
|||
|
|
@ -326,22 +326,3 @@ if [ -n "$DO_PUBLIC" ]; then
|
|||
rm -f "$HTML_DIR/CGAL-last-public"
|
||||
ln -s "${release_name}-public" "$HTML_DIR/CGAL-last-public"
|
||||
fi
|
||||
|
||||
if [ -n "$DO_PUBLIC" ]; then
|
||||
if docker version > /dev/null; then
|
||||
# Re-extract the full version of CGAL, with examples/, and doc_html/
|
||||
rm -rf ./${public_release_name}
|
||||
tar -xf "${HTML_DIR}/${release_name}-public/${public_release_name}.tar.xz"
|
||||
# Build the Windows installer
|
||||
docker pull cgal/cgal-nsis-dockerfile
|
||||
docker create -v `realpath ${DESTINATION}/${public_release_name}`:/mnt/cgal_release:ro,z \
|
||||
-v ${SOURCES_DIR}:/mnt/cgal_sources:ro,z \
|
||||
cgal/cgal-nsis-dockerfile
|
||||
container_id=`docker ps -q -l`
|
||||
docker start -a ${container_id}
|
||||
docker cp ${container_id}:/nsis_release/${public_release_name}-Setup.exe "${HTML_DIR}/${release_name}-public/"
|
||||
docker rm ${container_id}
|
||||
else
|
||||
echo "Cannot use Docker, the Windows installer will not be created" >&2
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue