Commit 2cdaceda authored by Arnaud Blanchard's avatar Arnaud Blanchard
Browse files

clean compile

parent 031bbc30
......@@ -6,7 +6,7 @@
#As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors have only limited liability.
#In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate, and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge.
#Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security.
#The fact that you are presently reading this means that you have had knowledge of the CeCILL v2.1 license and that you accept its terms. *
#The fact that you are presently reading this means that you have had knowledge of the CeCILL v2.1 license and that you accept its terms.
#
#Author: Arnaud Blanchard
#Date: April 2015
......@@ -24,9 +24,9 @@ usage
exit 1;
fi
project_dir="$PWD/$1"
current_dir="$PWD"
blaar_build_dir="${PWD}_build"
project_dir="$current_dir/$1"
blaar_build_dir="${current_dir}_build"
if [ "$2" ]; then
case "$2" in
......@@ -36,15 +36,22 @@ esac
else build_type="Release"
fi
build_dir="$blaar_build_dir/${build_type}/build/$1"
if [ ! $3 ]; then
target=`basename $1`
else
target=`basename $3`
fi
build_dir="$blaar_build_dir/${build_type}/$1"
mkdir -p ${blaar_build_dir}/doc/$1
mkdir -p $build_dir
[ -d build ] || ln -s "$blaar_build_dir" build
cd $build_dir
[ $project_dir/CMakeLists.txt -nt Makefile ] && cmake $project_dir -DCMAKE_BUILD_TYPE=${build_type} -DBLAAR_DIR="$current_dir" -DLIBRARY_OUTPUT_PATH="${blaar_build_dir}/${build_type}/lib" -DEXECUTABLE_OUTPUT_PATH="${blaar_build_dir}/${build_type}/bin" -DCMAKE_LIBRARY_PATH="${blaar_build_dir}/${build_type}/lib"
make --jobs `basename $3`
#[ $project_dir/CMakeLists.txt -nt Makefile ] &&
cmake $project_dir -DCMAKE_BUILD_TYPE=${build_type} -DBLAAR_DIR="$current_dir" -DLIBRARY_OUTPUT_PATH="${blaar_build_dir}/${build_type}/lib" -DEXECUTABLE_OUTPUT_PATH="${blaar_build_dir}/${build_type}/bin" -DCMAKE_LIBRARY_PATH="${blaar_build_dir}/${build_type}/lib"
make --jobs $target
result=$?
cd $current_dir
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment