Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bos #29947] [CEA 29944] SIGSEGV using filet
[modules/shaper.git]
/
make.sh
diff --git
a/make.sh
b/make.sh
index 8aac14dde9aab41e773abef99ff1568894968c4a..49d78c1f49a41d9d2aec9bc930821cf47f23b364 100755
(executable)
--- a/
make.sh
+++ b/
make.sh
@@
-13,17
+13,39
@@
while [[ $# > 0 ]]; do
USE_TEST_COVERAGE=ON
shift
;;
USE_TEST_COVERAGE=ON
shift
;;
+ models|test-models)
+ ADD_MODELS_TESTS=TRUE
+ shift
+ ;;
+ compatibility|test-compatibility)
+ ADD_COMPATIBILITY_TESTS=TRUE
+ shift
+ ;;
+ hdf|test-hdf-models)
+ ADD_HDF_TESTS=TRUE
+ shift
+ ;;
*)
shift
;;
esac
done
*)
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
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="${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}"
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}"
CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"