Commit 9c5c0f25 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'Cmake_tests' into 'master'

Cmake tests

See merge request !378
parents 991ee60b 34ec268b
......@@ -43,7 +43,7 @@ if [ ! -d $BUILDPATH ]; then
fi
cd $BUILDPATH
cmake -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
cmake -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DACG_BUILD_UNIT_TESTS=TRUE -DOPENMESH_BUILD_UNITTESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
if [ "$IWYU" == "yes" ]; then
# do iwyu check
......
......@@ -91,7 +91,7 @@ for /l %%x in (6, 1, 10) do (
)
:: check for qwt version 6.1.1 to 6.1.3 use the highest found version
for /l %%x in (0, 1, 5) do (
for /l %%x in (0, 1, 6) do (
echo "Checking for QWT in : %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/include"
if exist %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/include (
set QWT6_INCLUDE_DIR=%LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/include
......
Subproject commit cfc1f0ba3caa4ba4cae0c6ace066f4cf79e47887
Subproject commit 4901b089628929d3cfbb612cf9590a906dd3eacb
Markdown is supported
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