Merge branch 'master' of salome:modules/shaper

[modules/shaper.git] / make.sh

diff --git a/make.sh b/make.sh
index 2ebe12011854c06aad3b33df2221ef0d973cc436..eb82fb25c014c4661c798935de644b7d1dbd07e2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source env.sh
-
 while [[ $# > 0 ]]; do
   key="$1"
 
@@ -15,8 +13,8 @@ while [[ $# > 0 ]]; do
       USE_TEST_COVERAGE=ON
       shift
       ;;
-    standalone|Standalone)
-      MODE=Standalone
+    models|test-models)
+      ADD_MODELS_TESTS=TRUE
       shift
       ;;
     *)
@@ -25,15 +23,12 @@ while [[ $# > 0 ]]; do
   esac
 done
 
-if [[ ${MODE} = 'Standalone' ]]; then
-  source ${TOOLS_DIR}/env_standalone.sh
-else
-  source ${TOOLS_DIR}/env_salome.sh
-fi
+source env.sh
 
 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}"