diff options
| author | louiz’ <louiz@louiz.org> | 2017-02-01 10:04:20 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-02-01 10:04:20 +0100 |
| commit | 9b7732dbd5c21ba44fb71b12186050b7825118b6 (patch) | |
| tree | 69e89ab6f41f835aacc8950c62d4d03f22007d87 /debian/patches/2001_cmake_ignore_git.patch | |
| parent | 45f7396c8d30ed37570c4ecdaa886388f9beba3e (diff) | |
| parent | 8c575094d24d52faa64238d78f849577faaf1bab (diff) | |
| download | biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.tar.gz biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.tar.bz2 biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.tar.xz biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.zip | |
Merge remote-tracking branch 'debian/master' into debian
Diffstat (limited to 'debian/patches/2001_cmake_ignore_git.patch')
| -rw-r--r-- | debian/patches/2001_cmake_ignore_git.patch | 40 |
1 files changed, 40 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..4334d0f --- /dev/null +++ b/debian/patches/2001_cmake_ignore_git.patch @@ -0,0 +1,40 @@ +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" + DEPENDS test_suite biboumi) + add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" +@@ -263,8 +246,7 @@ + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + add_custom_target(dist +- DEPENDS ${ARCHIVE_NAME}.tar.xz +- DEPENDS catch) ++ DEPENDS ${ARCHIVE_NAME}.tar.xz) + + add_custom_target(rpm + DEPENDS dist |