Issue #1126: Code error fix

[modules/shaper.git] / make.sh

diff --git a/make.sh b/make.sh
index 9aaa3ae614eebf72e7d105eb135fe1e0ed8fee29..8aac14dde9aab41e773abef99ff1568894968c4a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1,31 +1,30 @@
 #!/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
+      ;;
+    *)
+      shift
+      ;;
   esac
-
-  shift
 done
 
-source ${TOOLS_DIR}/env_salome.sh
+source env.sh
 
 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} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}"
 CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"
 
 mkdir -p ${BUILD_DIR}