X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=CMakeLists.txt;h=e4251a9939bdd3c26a923938e34c2c639a2570d1;hp=1ab671d1f7939e6752d2dee762a1a6a1edf24770;hb=56f67ecca96efc7b72d03c95c8c42cfb66e31468;hpb=3751f10f7127ae0905aa0b52dc6de1c782a38c99

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ab671d..e4251a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,39 +11,36 @@ IF(APPLE)
 ENDIF(APPLE)
 OPTION(DO_CHARSET_CONVERSION "Do charset conversion on sent messages to UTF-8.  This requires libiconv." ON)
 OPTION(I_HAVE_READ_THE_README "I have fully read and understood the readme.txt." OFF)
+OPTION(ALTERNATE_CAPTCHA "Use alternate captcha.  This requires the FreeImage library." OFF)
 
-SET(FMS_SRC 
+SET(FMS_SRC
 src/base64.cpp
 src/bitmapvalidator.cpp
 src/board.cpp
 src/boardlist.cpp
-src/db
 src/dbconversions.cpp
 src/dbmaintenancethread.cpp
 src/dbsetup.cpp
 src/fmsapp.cpp
-src/freenet
 src/global.cpp
 src/hex.cpp
-src/http
 src/ipaddressacl.cpp
 src/localidentity.cpp
 src/main.cpp
 src/message.cpp
 src/messagelist.cpp
-src/nntp
+src/messagethread.cpp
 src/option.cpp
 src/optionssetup.cpp
 src/socketdefines.cpp
 src/stringfunctions.cpp
-src/threadwrapper
+src/threadbuilder.cpp
 src/db/sqlite3db.cpp
 src/db/sqlite3recordset.cpp
 src/db/sqlite3statement.cpp
 src/freenet/boardlistinserter.cpp
 src/freenet/boardlistrequester.cpp
 src/freenet/boardlistxml.cpp
-src/freenet/captcha
 src/freenet/fcpv2.cpp
 src/freenet/fileinserter.cpp
 src/freenet/fmsversionrequester.cpp
@@ -70,7 +67,6 @@ src/freenet/trustlistinserter.cpp
 src/freenet/trustlistrequester.cpp
 src/freenet/trustlistxml.cpp
 src/freenet/unkeyedidcreator.cpp
-src/freenet/captcha/easybmp
 src/freenet/captcha/simplecaptcha.cpp
 src/freenet/captcha/easybmp/EasyBMP.cpp
 src/freenet/captcha/easybmp/EasyBMP_Font.cpp
@@ -80,7 +76,6 @@ src/http/httpthread.cpp
 src/http/identityexportxml.cpp
 src/http/ipagehandler.cpp
 src/http/multipartparser.cpp
-src/http/pages
 src/http/pages/addpeerpage.cpp
 src/http/pages/announceidentitypage.cpp
 src/http/pages/boardspage.cpp
@@ -88,6 +83,10 @@ src/http/pages/confirmpage.cpp
 src/http/pages/controlboardpage.cpp
 src/http/pages/createidentitypage.cpp
 src/http/pages/execquerypage.cpp
+src/http/pages/forumcreatepostpage.cpp
+src/http/pages/forummainpage.cpp
+src/http/pages/forumthreadspage.cpp
+src/http/pages/forumviewthreadpage.cpp
 src/http/pages/homepage.cpp
 src/http/pages/insertedfilespage.cpp
 src/http/pages/localidentitiespage.cpp
@@ -95,9 +94,11 @@ src/http/pages/optionspage.cpp
 src/http/pages/peerdetailspage.cpp
 src/http/pages/peermaintenancepage.cpp
 src/http/pages/peertrustpage.cpp
+src/http/pages/recentlyaddedpage.cpp
 src/http/pages/showcaptchapage.cpp
+src/http/pages/showimagepage.cpp
+src/http/pages/versioninfopage.cpp
 src/nntp/extensiontrust.cpp
-src/nntp/mime
 src/nntp/nntpconnection.cpp
 src/nntp/nntplistener.cpp
 src/nntp/uwildmat.cpp
@@ -106,6 +107,9 @@ src/nntp/mime/MimeChar.cpp
 src/nntp/mime/MimeCode.cpp
 src/nntp/mime/MimeType.cpp
 src/threadwrapper/threadedexector.cpp
+src/unicode/ConvertUTF.c
+src/unicode/unicodeformatter.cpp
+src/unicode/utfconversion.cpp
 )
 
 SET(FMS_PLATFORM_SRC )
@@ -114,6 +118,17 @@ IF(DO_CHARSET_CONVERSION)
 	SET(FMS_SRC ${FMS_SRC} src/charsetconverter.cpp)
 ENDIF(DO_CHARSET_CONVERSION)
 
+IF(ALTERNATE_CAPTCHA)
+	SET(FMS_SRC ${FMS_SRC} 
+	src/freenet/captcha/alternatecaptcha1.cpp
+	src/freenet/captcha/alternatecaptcha2.cpp
+	src/freenet/captcha/alternatecaptchafonts.cpp
+	src/freenet/captcha/freeimage/bitmap.cpp
+	src/freenet/captcha/freeimage/font.cpp)
+ELSE(ALTERNATE_CAPTCHA)
+	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.")
+ENDIF(ALTERNATE_CAPTCHA)
+
 IF(NOT I_HAVE_READ_THE_README)
 	MESSAGE(FATAL_ERROR "You must fully read the readme.txt before continuing.")
 ENDIF(NOT I_HAVE_READ_THE_README)
@@ -156,9 +171,16 @@ FIND_LIBRARY(POCO_UTIL_LIBRARY NAMES PocoUtil PocoUtilmt)
 FIND_LIBRARY(POCO_XML_LIBRARY NAMES PocoXML PocoXMLmt)
 FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)
 FIND_LIBRARY(ICONV_LIBRARY NAMES iconv iconv_s libiconv libiconv_s)
+IF(ALTERNATE_CAPTCHA)
+	FIND_FILE(FREEIMAGE_LIBRARY NAMES libfreeimage.a PATHS /usr/lib/)
+	IF(NOT FREEIMAGE_LIBRARY)
+		FIND_LIBRARY(FREEIMAGE_LIBRARY NAMES FreeImage libFreeImage libfreeimage freeimage)
+	ENDIF(NOT FREEIMAGE_LIBRARY)
+ENDIF(ALTERNATE_CAPTCHA)
 
 IF(POCO_FOUNDATION_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${POCO_FOUNDATION_LIBRARY})
+	ADD_DEFINITIONS(-DPOCO_HAVE_IPv6)
 	IF(WIN32)
 		ADD_DEFINITIONS(-DPOCO_STATIC)
 	ENDIF(WIN32)
@@ -190,6 +212,7 @@ IF(NOT WIN32)
 ENDIF(NOT WIN32)
 
 IF(SQLITE3_LIBRARY)
+	MESSAGE(STATUS "Linking against system SQLite3 library.")
 	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
 ELSE(SQLITE3_LIBRARY)
 	IF(NOT USE_BUNDLED_SQLITE)
@@ -211,6 +234,15 @@ IF(DO_CHARSET_CONVERSION)
 	ENDIF(ICONV_LIBRARY)
 ENDIF(DO_CHARSET_CONVERSION)
 
+IF(ALTERNATE_CAPTCHA)
+	IF(FREEIMAGE_LIBRARY)
+		TARGET_LINK_LIBRARIES(fms ${FREEIMAGE_LIBRARY})
+		ADD_DEFINITIONS("-DALTERNATE_CAPTCHA")
+	ELSE(FREEIMAGE_LIBRARY)
+		MESSAGE(FATAL_ERROR "Could not find the FreeImage library.  Set the location manually, or turn off the alternate captchas.")
+	ENDIF(FREEIMAGE_LIBRARY)
+ENDIF(ALTERNATE_CAPTCHA)
+
 # FreeBSD won't find Poco include files without this
 IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 	INCLUDE_DIRECTORIES(AFTER /usr/local/include)