Avoid unlimited cycling on nodes sorting

[modules/shaper.git] / make.sh

diff --git a/make.sh b/make.sh
index 9aaa3ae614eebf72e7d105eb135fe1e0ed8fee29..dcacba097576f5acf49dce5ab02aae18405eea21 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1,31 +1,42 @@
 #!/bin/bash
 
-source env.sh
-
 while [[ $# > 0 ]]; do
   key="$1"
 
   case $key in
     debug|Debug)
-    CMAKE_BUILD_TYPE=Debug
-    shift
-    ;;
+      BUILD_TYPE=Debug
+      shift
+      ;;
     lcov|coverage)
-    CMAKE_BUILD_TYPE=Debug
-    USE_TEST_COVERAGE=ON
-    shift
-    ;;
+      BUILD_TYPE=Debug
+      USE_TEST_COVERAGE=ON
+      shift
+      ;;
+    models|test-models)
+      ADD_MODELS_TESTS=TRUE
+      shift
+      ;;
+    *)
+      shift
+      ;;
   esac
-
-  shift
 done
 
-source ${TOOLS_DIR}/env_salome.sh
+## 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=${CMAKE_BUILD_TYPE:-Release}"
+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} -DCMAKE_INSTALL_PREFIX:PATH=${NEWGEOM_ROOT_DIR}"
+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}"
 
 mkdir -p ${BUILD_DIR}