Skip to content

Commit

Permalink
Install newer CMake to echo the command in execute_process. Desperate…
Browse files Browse the repository at this point in the history
… move.
  • Loading branch information
pshriwise committed Mar 25, 2021
1 parent f3b7746 commit d817f7f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
11 changes: 11 additions & 0 deletions CI/circleci/build_dagmc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@ source ${docker_env}

function build_dagmc() {

cd ~
apt-get update -y
apt-get remove -y --purge cmake
apt-get install -y --fix-missing build-essential libssl-dev
wget https://github.com/Kitware/CMake/releases/download/v3.16.5/cmake-3.16.5.tar.gz
tar -zxvf cmake-3.16.5.tar.gz
cd cmake-3.16.5
./bootstrap
make
make install

if [ "$1" == "shared" ]; then
local build_dir=${dagmc_build_dir_shared}
local install_dir=${dagmc_install_dir_shared}
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
if(GIT_SUBMODULE)
message(STATUS "Submodule update")
execute_process(COMMAND bash "-c" "${GIT_EXECUTABLE} submodule update --init --recursive"
COMMAND_ECHO STDOUT
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL 0)
Expand Down

0 comments on commit d817f7f

Please sign in to comment.