diff --git a/platform-rhel9/inkscape-plus-sage.sh b/platform-rhel9/inkscape-plus-sage.sh index 4e819b7e..a681c6c9 100644 --- a/platform-rhel9/inkscape-plus-sage.sh +++ b/platform-rhel9/inkscape-plus-sage.sh @@ -9,9 +9,13 @@ sudo -u $JS_USERNAME sh -c 'git clone --recurse-submodules https://gitlab.com/ri cd inkscape-rebased sudo -u $JS_USERNAME sh -c 'mkdir build' cd build -#sudo -u $JS_USERNAME sh -c 'cmake -DENABLE_POPPLER_CAIRO=OFF -DCMAKE_CXX_STANDARD=20 ..' + +# to compile on Windows with msys2, use -DCMAKE_CXX_STANDARD=20 +# to compile on Linux, use -DCMAKE_CXX_STANDARD=17 + +#sudo -u $JS_USERNAME sh -c 'cmake -DENABLE_POPPLER_CAIRO=OFF -DCMAKE_CXX_STANDARD=17 ..' #sudo -u $JS_USERNAME sh -c 'make' #sudo make install -sudo -u $JS_USERNAME sh -c 'cmake -G Ninja -DENABLE_POPPLER_CAIRO=OFF -DCMAKE_CXX_STANDARD=20 ..' +sudo -u $JS_USERNAME sh -c 'cmake -G Ninja -DENABLE_POPPLER_CAIRO=OFF -DCMAKE_CXX_STANDARD=17 ..' sudo -u $JS_USERNAME sh -c 'ninja -j4' sudo ninja install \ No newline at end of file diff --git a/platform-rhel9/json-scada-install.sh b/platform-rhel9/json-scada-install.sh index abbf5a9e..78c92139 100644 --- a/platform-rhel9/json-scada-install.sh +++ b/platform-rhel9/json-scada-install.sh @@ -177,19 +177,6 @@ sleep 10 sudo supervisorctl status # sudo -u $JS_USERNAME sh -c 'firefox http://localhost &' -# to compile inkscape -# cd /home/jsonscada -# sudo -u $JS_USERNAME sh -c 'git clone --recurse-submodules https://gitlab.com/ricardolo/inkscape-rebased.git' -# cd inkscape-rebased -# sudo -u $JS_USERNAME sh -c 'mkdir build' -# cd build -# sudo -u $JS_USERNAME sh -c 'cmake -G Ninja -DENABLE_POPPLER_CAIRO=OFF -DCMAKE_CXX_STANDARD=20 ..' -# sudo -u $JS_USERNAME sh -c 'ninja -j4' -# sudo ninja install -## sudo -u $JS_USERNAME sh -c 'cmake -DENABLE_POPPLER_CAIRO=OFF -DCMAKE_CXX_STANDARD=20 ..' -## sudo -u $JS_USERNAME sh -c 'make' -## sudo make install - echo "To compile and install Inkscape+SAGE, run the following command: sudo sh ./inkscape-plus-sage.sh" echo "To open web interface run: firefox http://localhost" echo "Default credentials: admin / jsonscada"