X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=make.sh;h=49d78c1f49a41d9d2aec9bc930821cf47f23b364;hb=86f4ec4eb5ff5f119914f3d44cf945b49845d8c2;hp=d70b02447ea72b01afecd2d6451da4ceec416485;hpb=cf8a8f9b8dbe8f8a42900a7a2e090b0f93438db9;p=modules%2Fshaper.git diff --git a/make.sh b/make.sh index d70b02447..49d78c1f4 100755 --- a/make.sh +++ b/make.sh @@ -17,6 +17,14 @@ while [[ $# > 0 ]]; do ADD_MODELS_TESTS=TRUE shift ;; + compatibility|test-compatibility) + ADD_COMPATIBILITY_TESTS=TRUE + shift + ;; + hdf|test-hdf-models) + ADD_HDF_TESTS=TRUE + shift + ;; *) shift ;; @@ -26,12 +34,18 @@ done ## Preserve PTHONPATH in order to avoid problems with Sphinx on Fedora26 because of Pigments in ParaView export PYTHONPATH_OLD=$PYTHONPATH source env.sh -export PYTHONPATH=$PYTHONPATH_OLD + +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} -DADD_COMPATIBILITY_TESTS=${ADD_COMPATIBILITY_TESTS:-FALSE}" +CMAKE_ARGS="${CMAKE_ARGS} -DADD_HDF_TESTS=${ADD_HDF_TESTS:-FALSE}" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}" CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"