Skip to content

Commit

Permalink
Do not install cmake from kitware for ubuntu-latest.
Browse files Browse the repository at this point in the history
  • Loading branch information
ssheorey committed Dec 28, 2024
1 parent 34d8039 commit c5dfe0b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.24)
# If you're using Ubuntu 20.04, we suggest you install the latest CMake from the
# official repository https://apt.kitware.com/.
# If you're not using the latest Ubuntu / distro LTS release, we suggest you
# install the latest CMake from the official repository https://apt.kitware.com/.
# CMake 3.24+ is required for CUDA native arch selection
# CMake 3.22+ is required by Assimp v5.4.2
# CMake 3.20+ is required to detect IntelLLVM compiler for SYCL
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
docutils==0.20.1
furo==2023.9.10
jinja2==3.1.4
jinja2==3.1.5
m2r2==0.3.3.post2
matplotlib==3.7.3
nbsphinx==0.9.3
Expand Down
20 changes: 9 additions & 11 deletions util/ci_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -340,18 +340,16 @@ test_cpp_example() {
install_docs_dependencies() {
echo
echo Install ubuntu dependencies
echo Update cmake needed in Ubuntu 20.04
sudo apt-key adv --fetch-keys https://apt.kitware.com/keys/kitware-archive-latest.asc
sudo apt-add-repository --yes 'deb https://apt.kitware.com/ubuntu/ focal main'
./util/install_deps_ubuntu.sh assume-yes
sudo apt-get install --yes cmake
sudo apt-get install --yes libxml2-dev libxslt-dev python3-dev
sudo apt-get install --yes doxygen
sudo apt-get install --yes texlive
sudo apt-get install --yes texlive-latex-extra
sudo apt-get install --yes ghostscript
sudo apt-get install --yes pandoc
sudo apt-get install --yes ccache
$SUDO apt-get install --yes ccache \
cmake \
doxygen \
ghostscript \
libxml2-dev \
libxslt-dev \
pandoc \
texlive \
texlive-latex-extra
echo
echo Install Python dependencies for building docs
command -v python
Expand Down

0 comments on commit c5dfe0b

Please sign in to comment.