version 0.3.18

[fms.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03af9bd..7cf50e0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,9 @@ IF(APPLE)
 ENDIF(APPLE)\r
 OPTION(DO_CHARSET_CONVERSION "Do charset conversion on sent messages to UTF-8.  This requires libiconv." ON)\r
 OPTION(I_HAVE_READ_THE_README "I have fully read and understood the readme.txt." OFF)\r
+OPTION(ALTERNATE_CAPTCHA "Use alternate captcha.  This requires the FreeImage library." OFF)\r
 \r
-SET(FMS_SRC \r
+SET(FMS_SRC\r
 src/base64.cpp\r
 src/bitmapvalidator.cpp\r
 src/board.cpp\r
@@ -95,7 +96,9 @@ src/http/pages/optionspage.cpp
 src/http/pages/peerdetailspage.cpp\r
 src/http/pages/peermaintenancepage.cpp\r
 src/http/pages/peertrustpage.cpp\r
+src/http/pages/recentlyaddedpage.cpp\r
 src/http/pages/showcaptchapage.cpp\r
+src/http/pages/versioninfopage.cpp\r
 src/nntp/extensiontrust.cpp\r
 src/nntp/mime\r
 src/nntp/nntpconnection.cpp\r
@@ -114,6 +117,17 @@ IF(DO_CHARSET_CONVERSION)
        SET(FMS_SRC ${FMS_SRC} src/charsetconverter.cpp)\r
 ENDIF(DO_CHARSET_CONVERSION)\r
 \r
+IF(ALTERNATE_CAPTCHA)\r
+       SET(FMS_SRC ${FMS_SRC} \r
+       src/freenet/captcha/alternatecaptcha1.cpp\r
+       src/freenet/captcha/alternatecaptcha2.cpp\r
+       src/freenet/captcha/alternatecaptchafonts.cpp\r
+       src/freenet/captcha/freeimage/bitmap.cpp\r
+       src/freenet/captcha/freeimage/font.cpp)\r
+ELSE(ALTERNATE_CAPTCHA)\r
+       MESSAGE(STATUS "You are using the old captcha generator.  Add a -D ALTERNATE_CAPTCHA=ON to the command line to use the alternate captcha generator.")\r
+ENDIF(ALTERNATE_CAPTCHA)\r
+\r
 IF(NOT I_HAVE_READ_THE_README)\r
        MESSAGE(FATAL_ERROR "You must fully read the readme.txt before continuing.")\r
 ENDIF(NOT I_HAVE_READ_THE_README)\r
@@ -156,9 +170,16 @@ FIND_LIBRARY(POCO_UTIL_LIBRARY NAMES PocoUtil PocoUtilmt)
 FIND_LIBRARY(POCO_XML_LIBRARY NAMES PocoXML PocoXMLmt)\r
 FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)\r
 FIND_LIBRARY(ICONV_LIBRARY NAMES iconv iconv_s libiconv libiconv_s)\r
+IF(ALTERNATE_CAPTCHA)\r
+       FIND_FILE(FREEIMAGE_LIBRARY NAMES libfreeimage.a PATHS /usr/lib/)\r
+       IF(NOT FREEIMAGE_LIBRARY)\r
+               FIND_LIBRARY(FREEIMAGE_LIBRARY NAMES FreeImage libFreeImage libfreeimage freeimage)\r
+       ENDIF(NOT FREEIMAGE_LIBRARY)\r
+ENDIF(ALTERNATE_CAPTCHA)\r
 \r
 IF(POCO_FOUNDATION_LIBRARY)\r
        TARGET_LINK_LIBRARIES(fms ${POCO_FOUNDATION_LIBRARY})\r
+       ADD_DEFINITIONS(-DPOCO_HAVE_IPv6)\r
        IF(WIN32)\r
                ADD_DEFINITIONS(-DPOCO_STATIC)\r
        ENDIF(WIN32)\r
@@ -210,3 +231,17 @@ IF(DO_CHARSET_CONVERSION)
                ENDIF(WIN32)\r
        ENDIF(ICONV_LIBRARY)\r
 ENDIF(DO_CHARSET_CONVERSION)\r
+\r
+IF(ALTERNATE_CAPTCHA)\r
+       IF(FREEIMAGE_LIBRARY)\r
+               TARGET_LINK_LIBRARIES(fms ${FREEIMAGE_LIBRARY})\r
+               ADD_DEFINITIONS("-DALTERNATE_CAPTCHA")\r
+       ELSE(FREEIMAGE_LIBRARY)\r
+               MESSAGE(FATAL_ERROR "Could not find the FreeImage library.  Set the location manually, or turn off the alternate captchas.")\r
+       ENDIF(FREEIMAGE_LIBRARY)\r
+ENDIF(ALTERNATE_CAPTCHA)\r
+\r
+# FreeBSD won't find Poco include files without this\r
+IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")\r
+       INCLUDE_DIRECTORIES(AFTER /usr/local/include)\r
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")\r