summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/2001_cmake_ignore_git.patch38
-rw-r--r--debian/patches/README3
-rw-r--r--debian/patches/series1
3 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/2001_cmake_ignore_git.patch b/debian/patches/2001_cmake_ignore_git.patch
new file mode 100644
index 0000000..bdbbd49
--- /dev/null
+++ b/debian/patches/2001_cmake_ignore_git.patch
@@ -0,0 +1,38 @@
+Description: Avoid cmake messing with git
+Author: Jonas Smedegaard <dr@jones.dk>
+Last-Update: 2016-12-21
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -198,23 +198,6 @@
+ database)
+ endif()
+
+-include(ExternalProject)
+-ExternalProject_Add(catch
+- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"
+- PREFIX "external"
+- UPDATE_COMMAND ""
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ""
+- )
+-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE)
+-ExternalProject_Get_Property(catch SOURCE_DIR)
+-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
+- target_include_directories(test_suite
+- PUBLIC "${SOURCE_DIR}/include/"
+- )
+- add_dependencies(test_suite catch)
+-endif()
+ add_custom_target(check COMMAND "test_suite" "-s"
+ DEPENDS test_suite biboumi)
+ add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/"
+@@ -258,7 +241,6 @@
+ COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "${ARCHIVE_NAME}.tar.xz created."
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ )
+-add_dependencies(dist catch)
+
+ add_custom_target(rpm
+ COMMAND mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9da3ec6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_cmake_ignore_git.patch