version 0.2.8

[fms.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c81d5cb..742bfc2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 PROJECT(fms)\r
 \r
-OPTION(USE_BUNDLED_SQLITE "Use the bundled SQLite3 library" OFF)\r
+OPTION(USE_BUNDLED_SQLITE "Use the bundled SQLite3 library." OFF)\r
+OPTION(DO_CHARSET_CONVERSION "Do charset conversion on sent messages to UTF-8.  This requires libiconv." OFF)\r
 \r
 SET(FMS_SRC \r
 src/base64.cpp\r
@@ -84,6 +85,10 @@ src/pthreadwrapper/threadedexecutor.cpp
 src/xyssl/sha1.c\r
 )\r
 \r
+IF(DO_CHARSET_CONVERSION)\r
+       SET(FMS_SRC ${FMS_SRC} src/charsetconverter.cpp)\r
+ENDIF(DO_CHARSET_CONVERSION)\r
+\r
 IF(WIN32)\r
        SET(FMS_PLATFORM_SRC src/fmsservice.cpp)\r
 ELSE(WIN32)\r
@@ -132,6 +137,7 @@ ENDIF(NOT USE_BUNDLED_SQLITE)
 FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)\r
 FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)\r
 FIND_LIBRARY(SHTTPD_LIBRARY NAMES shttpd shttpd_s)\r
+FIND_LIBRARY(ICONV_LIBRARY NAMES iconv iconv_s libiconv libiconv_s)\r
 \r
 IF(SQLITE3_LIBRARY)\r
        TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})\r
@@ -174,3 +180,14 @@ ELSE(SHTTPD_LIBRARY)
        ADD_LIBRARY(shttpd ${SHTTPD_PLATFORM_SRC} libs/shttpd/auth.c libs/shttpd/cgi.c libs/shttpd/config.c libs/shttpd/io_cgi.c libs/shttpd/io_dir.c libs/shttpd/io_emb.c libs/shttpd/io_file.c libs/shttpd/io_socket.c libs/shttpd/io_ssi.c libs/shttpd/io_ssl.c libs/shttpd/log.c libs/shttpd/md5.c libs/shttpd/shttpd.c libs/shttpd/string.c)\r
        TARGET_LINK_LIBRARIES(fms shttpd)\r
 ENDIF(SHTTPD_LIBRARY)\r
+\r
+IF(DO_CHARSET_CONVERSION)\r
+       ADD_DEFINITIONS(-DDO_CHARSET_CONVERSION)\r
+       IF(ICONV_LIBRARY)\r
+               TARGET_LINK_LIBRARIES(fms ${ICONV_LIBRARY})\r
+       ELSE(ICONV_LIBRARY)\r
+               IF(WIN32)\r
+                       MESSAGE(FATAL ERROR "Could not find iconv library.  You must set the location manually, or turn off charset conversion.")\r
+               ENDIF(WIN32)\r
+       ENDIF(ICONV_LIBRARY)\r
+ENDIF(DO_CHARSET_CONVERSION)\r