diff options
Diffstat (limited to 'dev-util/cmocka/files')
-rw-r--r-- | dev-util/cmocka/files/cmocka-1.1.3-examples.patch | 45 | ||||
-rw-r--r-- | dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch | 43 |
2 files changed, 0 insertions, 88 deletions
diff --git a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch b/dev-util/cmocka/files/cmocka-1.1.3-examples.patch deleted file mode 100644 index 3d5fcc8098f0..000000000000 --- a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ee264da1aa222b354cee36184ab48c2072f62243 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider <asn@cryptomilk.org> -Date: Wed, 23 Jan 2019 11:20:31 +0100 -Subject: [PATCH] cmake: Add WITH_EXAMPLES options - -This is turned on by default, but you can disable it, if you just -package cmocka for an opterating system. - -Fixes #14 - -Signed-off-by: Andreas Schneider <asn@cryptomilk.org> ---- - CMakeLists.txt | 4 +++- - DefineOptions.cmake | 1 + - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7778039..702be97 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,7 +60,9 @@ if (UNIT_TESTING) - add_subdirectory(tests) - endif (UNIT_TESTING) - --add_subdirectory(example) -+if (WITH_EXAMPLES) -+ add_subdirectory(example) -+endif () - - # pkg-config file - configure_file(cmocka.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc) -diff --git a/DefineOptions.cmake b/DefineOptions.cmake -index 5bc1ef3..911ff1d 100644 ---- a/DefineOptions.cmake -+++ b/DefineOptions.cmake -@@ -1,5 +1,6 @@ - option(WITH_STATIC_LIB "Build with a static library" OFF) - option(WITH_CMOCKERY_SUPPORT "Install a cmockery header" OFF) -+option(WITH_EXAMPLES "Build examples" ON) - option(UNIT_TESTING "Build with unit testing" OFF) - option(PICKY_DEVELOPER "Build with picky developer flags" OFF) - --- -2.18.1 - diff --git a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch deleted file mode 100644 index c093021aa824..000000000000 --- a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1abfea55df24e83c2ea321b5f2b75e1a58963bc6 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider <asn@cryptomilk.org> -Date: Wed, 24 Oct 2018 16:33:39 +0200 -Subject: cmake: Fix doxygen generation - -Fixes #12 - -Signed-off-by: Andreas Schneider <asn@cryptomilk.org> ---- - CMakeLists.txt | 2 +- - doc/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 88408a9..7778039 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,9 +51,9 @@ if (MINGW) - endif (MINGW) - - # check subdirectories --add_subdirectory(doc) - add_subdirectory(include) - add_subdirectory(src) -+add_subdirectory(doc) - - include(AddCMockaTest) - if (UNIT_TESTING) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index a7bc65e..6ac7494 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -38,7 +38,7 @@ if (DOXYGEN_FOUND) - - doxygen_add_docs(docs - ${cmocka-library_SOURCE_DIR} -- ${cmocka-headers_SOURCE_DIR} -+ ${cmocka-header_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}) - endif(DOXYGEN_FOUND) - --- -cgit v1.2.1 |