Skip to content
Snippets Groups Projects
Commit 4d3d12ba authored by Tomáš Pecka's avatar Tomáš Pecka
Browse files

OBS: PKGBUILD and patches update

parent bdaf1db7
No related branches found
No related tags found
1 merge request!70Dev tp
Pipeline #33042 canceled
......@@ -10,11 +10,17 @@ url='https://gitlab.fit.cvut.cz/algorithms-library-toolkit/'
license=('GPL')
depends=('tclap' 'libxml2' 'readline' 'qt5-base>=5.7' 'graphviz' 'jsoncpp')
makedepends=('python3' 'cmake' 'gcc' 'bash' 'make' 'tclap')
patch=('remove-werror.patch')
provides=('algorithms-library')
conflicts=('algorithms-library')
sha256sums=('SKIP')
source=("algorithms-library.tar.gz")
sha256sums=('SKIP' 'c16c8d32762a69edaf27a96f348d14cf96092273eda99f65d6215b0d2b6ad4fb' '7a8e3aa1c28371e8317a42468dfce62e4233929a2291e53fc7b2dae310810ae5')
source=("algorithms-library.tar.gz" "remove-werror.patch" "skip-measurements-tests.patch")
prepare() {
cd "${srcdir}/${pkgname%-git}"
ls
patch -p0 --forward --input="${srcdir}/skip-measurements-tests.patch"
patch -p0 --forward --input="${srcdir}/remove-werror.patch"
}
 
build() {
cd "${srcdir}/${pkgname%-git}"
......
diff --git CMake/CMakeLists_root.txt CMake/CMakeLists_root.txt
index 70f40be32..a2f4a971a 100644
--- CMake/CMakeLists_root.txt
+++ CMake/CMakeLists_root.txt
@@ -78,7 +78,7 @@ endif ()
# Flags according to Debug/Release decision
# - CMake uses -g on Debug implicitly
# - fPIC for libraries will be enabled explicitly
-set(ALIB_BUILD_FLAGS_COMMON -Wall -pedantic -pipe -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
+set(ALIB_BUILD_FLAGS_COMMON -Wall -pedantic -pipe -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
set(ALIB_BUILD_FLAGS_DEBUG ${{ALIB_BUILD_FLAGS_COMMON}} -Og)
set(ALIB_BUILD_FLAGS_RELEASE ${{ALIB_BUILD_FLAGS_COMMON}} -O3)
diff --git CMake/Modules/CompilerFlags.cmake CMake/Modules/CompilerFlags.cmake
index 942fa958b..c06f3992e 100644
--- CMake/Modules/CompilerFlags.cmake
+++ CMake/Modules/CompilerFlags.cmake
@@ -15,7 +15,7 @@ if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "(Clang|GNU)")
endif ()
# set build flags
-add_compile_options(-Wall -pedantic -pipe -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
+add_compile_options(-Wall -pedantic -pipe -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
add_definitions(-DQT_NO_FOREACH)
diff --git alib2measure/test-src/measurements/MeasurementsTest.cpp alib2measure/test-src/measurements/MeasurementsTest.cpp
index 1571890f1..9370ffd03 100644
--- alib2measure/test-src/measurements/MeasurementsTest.cpp
+++ alib2measure/test-src/measurements/MeasurementsTest.cpp
@@ -5,7 +5,7 @@
#include <iostream>
#include <alib/measure>
-TEST_CASE ( "Measurements", "[unit][measure][measurements]" ) {
+TEST_CASE ( "Measurements", "[unit][measure][measurements][.]" ) {
measurements::reset ( );
SECTION ( "Construct Measurements" ) {
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment