X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=make.sh;h=dcacba097576f5acf49dce5ab02aae18405eea21;hb=bc68c24f2be18a091832a8215428c4039bac5ddf;hp=15b951265c280548253548ee4de85d763d9d6487;hpb=24f9658d6e124a268c6a3abcf24f07aa2dc6d268;p=modules%2Fshaper.git

diff --git a/make.sh b/make.sh
index 15b951265..dcacba097 100755
--- a/make.sh
+++ b/make.sh
@@ -1,40 +1,42 @@
 #!/bin/bash
 
-source env.sh
-
 while [[ $# > 0 ]]; do
   key="$1"
 
   case $key in
     debug|Debug)
-    BUILD_TYPE=Debug
-    shift
-    ;;
+      BUILD_TYPE=Debug
+      shift
+      ;;
     lcov|coverage)
-    BUILD_TYPE=Debug
-    USE_TEST_COVERAGE=ON
-    shift
-    ;;
-    standalone|Standalone)
-    MODE=Standalone
-    shift
-    ;;
+      BUILD_TYPE=Debug
+      USE_TEST_COVERAGE=ON
+      shift
+      ;;
+    models|test-models)
+      ADD_MODELS_TESTS=TRUE
+      shift
+      ;;
     *)
-    shift
-    ;;
+      shift
+      ;;
   esac
 done
 
-if [[ ${MODE} = 'Standalone' ]]; then
-  source ${TOOLS_DIR}/env_standalone.sh
-else
-  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=${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}