Merge remote-tracking branch 'upstream/master'

This commit is contained in:
tholdawa 2014-01-22 11:27:46 -08:00
commit 66628d1fc5

View File

@ -340,10 +340,6 @@ OPTION(
ON
)
IF(VMIME_BUILD_SAMPLES)
ADD_SUBDIRECTORY(examples)
ENDIF()
##############################################################################
# Packaging / Distribution
@ -1064,6 +1060,14 @@ IF(VMIME_HAVE_MESSAGING_PROTO_SENDMAIL)
ENDIF()
##############################################################################
# Build examples
IF(VMIME_BUILD_SAMPLES)
ADD_SUBDIRECTORY(examples)
ENDIF()
# Set our configure file
CONFIGURE_FILE(cmake/config.hpp.cmake ${CMAKE_SOURCE_DIR}/src/vmime/config.hpp)