X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=make.sh;h=dcacba097576f5acf49dce5ab02aae18405eea21;hb=b0196aeefbaa53754b1052fab904386707caad87;hp=8aac14dde9aab41e773abef99ff1568894968c4a;hpb=e7db636eab6e797f477731d35adc0ae524fd83c9;p=modules%2Fshaper.git diff --git a/make.sh b/make.sh index 8aac14dde..dcacba097 100755 --- a/make.sh +++ b/make.sh @@ -13,17 +13,29 @@ while [[ $# > 0 ]]; do USE_TEST_COVERAGE=ON shift ;; + models|test-models) + ADD_MODELS_TESTS=TRUE + shift + ;; *) shift ;; esac done +## Preserve PTHONPATH in order to avoid problems with Sphinx on Fedora26 because of Pigments in ParaView +export PYTHONPATH_OLD=$PYTHONPATH source env.sh +if [[ ${OS_NAME} = Fedora26-64 ]] +then + export PYTHONPATH=$PYTHONPATH_OLD +fi + CMAKE_ARGS="" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}" CMAKE_ARGS="${CMAKE_ARGS} -DUSE_TEST_COVERAGE=${USE_TEST_COVERAGE:-OFF}" +CMAKE_ARGS="${CMAKE_ARGS} -DADD_MODELS_TESTS=${ADD_MODELS_TESTS:-FALSE}" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}" CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"