diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 19:13:43 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 19:13:43 +0100 |
| commit | e87720301fa697858ae0e839a29ac057cb508eaf (patch) | |
| tree | c9efae09df89564c77686da5de190207123e5a46 /debian | |
| parent | c012d3c5bae8c42bfe6594a487f8e669a99d5533 (diff) | |
| download | biboumi-e87720301fa697858ae0e839a29ac057cb508eaf.tar.gz biboumi-e87720301fa697858ae0e839a29ac057cb508eaf.tar.bz2 biboumi-e87720301fa697858ae0e839a29ac057cb508eaf.tar.xz biboumi-e87720301fa697858ae0e839a29ac057cb508eaf.zip | |
Add patch 2001 to avoid cmake messing with git.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/2001_cmake_ignore_git.patch | 38 | ||||
| -rw-r--r-- | debian/patches/README | 3 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
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 |