diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0c7024af..eff6570ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,12 @@ jobs: environment-file: environment-dev.yml python-version: ${{ matrix.python }} miniconda-version: "latest" - + + - name: Install Conda GCC + if: runner.os == 'Linux' + run: | + conda install -y -c conda-forge gcc gxx + - name: Install Helios run: | python -m pip install -v . diff --git a/README.md b/README.md index 3c031abdd..8abfe40aa 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,11 @@ git clone https://github.com/3dgeo-heidelberg/helios.git cd helios conda env create -f environment-dev.yml conda activate helios-dev + +# On Linux, the following line is recommended, to go with a Conda-provided compiler. +# We had issues with incompatible system compilers before. +conda install -c conda-forge gcc gxx + python -m pip install --no-deps -v -e . ``` diff --git a/src/scene/dynamic/DynSequence.h b/src/scene/dynamic/DynSequence.h index 98b829f50..bfc27fe24 100644 --- a/src/scene/dynamic/DynSequence.h +++ b/src/scene/dynamic/DynSequence.h @@ -205,7 +205,7 @@ class DynSequence { * @param id New identifier for the dynamic sequence * @see DynSequence::setId */ - inline void setId(string const & id) const {this->id = id;} + inline void setId(string const & id) {this->id = id;} /** * @brief Get next identifier for the dynamic sequence * @return Identifier of next dynamic sequence