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
Issue #2543: Provide completion on editing.
[modules/shaper.git]
/
make.sh
diff --git
a/make.sh
b/make.sh
index 15b951265c280548253548ee4de85d763d9d6487..eb82fb25c014c4661c798935de644b7d1dbd07e2 100755
(executable)
--- a/
make.sh
+++ b/
make.sh
@@
-1,40
+1,35
@@
#!/bin/bash
#!/bin/bash
-source env.sh
-
while [[ $# > 0 ]]; do
key="$1"
case $key in
debug|Debug)
while [[ $# > 0 ]]; do
key="$1"
case $key in
debug|Debug)
- BUILD_TYPE=Debug
- shift
- ;;
+
BUILD_TYPE=Debug
+
shift
+
;;
lcov|coverage)
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
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="${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}
CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"
mkdir -p ${BUILD_DIR}