update package vmime

This commit is contained in:
Mark Brand 2013-11-16 14:44:54 +01:00
parent a335c021e3
commit e54494e05f
2 changed files with 62 additions and 5 deletions

View File

@ -1,10 +1,10 @@
This file is part of MXE.
See index.html for further information.
From 01e591d33435cbd027be6a85bac521138e45c19f Mon Sep 17 00:00:00 2001
From 206cc1576fa440808acf3d49e445e6580984da26 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 14 May 2013 09:21:46 +0200
Subject: [PATCH] predefine VMIME_STATIC for convenience
Subject: [PATCH 1/2] predefine VMIME_STATIC for convenience
diff --git a/vmime.pc.in b/vmime.pc.in
@ -19,5 +19,58 @@ index fc1103e..11dd0ea 100644
+Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ -DVMIME_STATIC
--
1.8.1.4
1.8.4
From 0ded9a088ad0ddba3244a3c3f20b2e7cf665a1f8 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 16 Nov 2013 12:00:16 +0100
Subject: [PATCH 2/2] add BUILD_DOCUMENTATION option
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e92513..9b4693b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -941,20 +941,27 @@ ENDIF()
##############################################################################
# Documentation
-FIND_PACKAGE(Doxygen)
+OPTION(
+ VMIME_BUILD_DOCUMENTATION
+ "Build documentation"
+ ON
+)
-IF(DOXYGEN_FOUND)
- CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile @ONLY)
+IF(VMIME_BUILD_DOCUMENTATION)
+ FIND_PACKAGE(Doxygen)
- # Make a target so that documentation can be generated by running "make doc"
- ADD_CUSTOM_TARGET(
- doc
- ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- COMMENT "Generating API documentation with Doxygen" VERBATIM
- )
-ENDIF(DOXYGEN_FOUND)
+ IF(DOXYGEN_FOUND)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile @ONLY)
+ # Make a target so that documentation can be generated by running "make doc"
+ ADD_CUSTOM_TARGET(
+ doc
+ ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMENT "Generating API documentation with Doxygen" VERBATIM
+ )
+ ENDIF(DOXYGEN_FOUND)
+ENDIF(VMIME_BUILD_DOCUMENTATION)
##############################################################################
# Sanity checks
--
1.8.4

View File

@ -3,8 +3,8 @@
PKG := vmime
$(PKG)_IGNORE :=
$(PKG)_VERSION := c406d45
$(PKG)_CHECKSUM := dc5c68f18f2123ededa7ea98c86ee0b234a3d4fc
$(PKG)_VERSION := 7209863
$(PKG)_CHECKSUM := 8e34f2f5ac9b7bd24db5d3aa933b6883c291c756
$(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
@ -26,6 +26,10 @@ define $(PKG)_BUILD
-DCMAKE_CXX_FLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \
-DVMIME_BUILD_STATIC_LIBRARY=ON \
-DVMIME_BUILD_SHARED_LIBRARY=OFF \
-DVMIME_BUILD_SAMPLES=OFF \
-DVMIME_BUILD_DOCUMENTATION=OFF \
-DCMAKE_MODULE_PATH='$(1)/cmake' \
-DICU_LIBRARIES="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
.
$(MAKE) -C '$(1)' -j '$(JOBS)'