Merged source and header files in directory structure. Got rid of SConstruct build.

.gitignore

@@ -7,11 +7,6 @@
 # Doxygen-generated
 doc/html/*
 
-# SConstruct
-.sconsign.dblite
-/options.cache
-/run-tests
-
 # CMake-generated / Build files
 CMakeFiles/
 CMakeCache.txt
@@ -24,9 +19,9 @@ cmake_install.cmake
 /install_manifest*
 /libvmime.a
 /vmime.pc
-/vmime/config.hpp
+/src/vmime/config.hpp
-/vmime/export-static.hpp
+/src/vmime/export-static.hpp
-/vmime/export-shared.hpp
+/src/vmime/export-shared.hpp
 /COPYING.txt
 build/
 Makefile

CMakeLists.txt

@@ -71,19 +71,20 @@ SET(VMIME_LIBRARY_NAME vmime)
 FILE(
 	GLOB_RECURSE
 	VMIME_LIBRARY_SRC_FILES
-	src/*
+	${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/*.cpp
 )
 
 FILE(
 	GLOB_RECURSE
 	VMIME_LIBRARY_INCLUDE_FILES
-	vmime/*
+	${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/*.hpp
 )
 
-LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "vmime/config.hpp")
+LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/config.hpp")
 
 INCLUDE_DIRECTORIES(
-	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}          # for "contrib/"
+	${CMAKE_CURRENT_SOURCE_DIR}/src      # for "vmime/
 )
 
 INCLUDE(GenerateExportHeader)
@@ -116,10 +117,10 @@ IF(VMIME_BUILD_SHARED_LIBRARY)
 		COPY
 		${CMAKE_CURRENT_BINARY_DIR}/export-shared.hpp
 		DESTINATION
-		${PROJECT_SOURCE_DIR}/vmime
+		${PROJECT_SOURCE_DIR}/src/vmime
 	)
 
-	LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "vmime/export-shared.hpp")
+	LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/export-shared.hpp")
 
 	SET_TARGET_PROPERTIES(
 		${VMIME_LIBRARY_NAME}
@@ -161,10 +162,10 @@ IF(VMIME_BUILD_STATIC_LIBRARY)
 		COPY
 		${CMAKE_CURRENT_BINARY_DIR}/export-static.hpp
 		DESTINATION
-		${PROJECT_SOURCE_DIR}/vmime
+		${PROJECT_SOURCE_DIR}/src/vmime
 	)
 
-	LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "vmime/export-static.hpp")
+	LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/export-static.hpp")
 
 	SET_TARGET_PROPERTIES(
 		${VMIME_LIBRARY_NAME}-static
@@ -244,8 +245,8 @@ IF(VMIME_BUILD_STATIC_LIBRARY)
 ENDIF()
 
 # Installation of header files
-INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_INCLUDE_FILES headers)
+INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_INCLUDE_FILES headers src/)
-INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_GENERATED_INCLUDE_FILES headers)
+INSTALL_HEADERS_WITH_DIRECTORY(VMIME_LIBRARY_GENERATED_INCLUDE_FILES headers src/)
 
 #INSTALL(
 #	FILES ${VMIME_LIBRARY_INCLUDE_FILES}
@@ -1064,7 +1065,7 @@ ENDIF()
 
 
 # Set our configure file
-CONFIGURE_FILE(cmake/config.hpp.cmake ${CMAKE_SOURCE_DIR}/vmime/config.hpp)
+CONFIGURE_FILE(cmake/config.hpp.cmake ${CMAKE_SOURCE_DIR}/src/vmime/config.hpp)
 
 # PkgConfig post-configuration
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/vmime.pc.in ${CMAKE_BINARY_DIR}/vmime.pc @ONLY)

cmake/Utils.cmake

@@ -1,11 +1,11 @@
 
 # Installing headers and preserving the directory structure
 # Found here: http://www.semipol.de/archives/251
-MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST COMPONENT_NAME)
+MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST COMPONENT_NAME REMOVE_PREFIX)
 
 	FOREACH(HEADER ${${HEADER_LIST}})
 		STRING(REGEX MATCH "(.*)[/\\]" DIR ${HEADER})
-		STRING(REPLACE "${CMAKE_SOURCE_DIR}/" "" DIR ${DIR})
+		STRING(REPLACE "${CMAKE_SOURCE_DIR}/${REMOVE_PREFIX}" "" DIR ${DIR})
 		INSTALL(FILES ${HEADER} DESTINATION include/${DIR} COMPONENT ${COMPONENT_NAME})
 	ENDFOREACH(HEADER)
 

examples/README

@@ -1,12 +0,0 @@
-=========================================
-Instructions for compiling VMime examples
-=========================================
-
-1) Configure, compile and install vmime library
-
-2) Compile the sample programs with:
-   $ g++ -o exampleX exampleX.cpp `pkg-config libvmime`
-
-3) For a more complete documentation, please visit:
-   http://www.vmime.org/documentation/
-