X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=CMakeLists.txt;h=0cfa93258b2f1d353cc8315b308de1f87e8fa270;hb=3dc3ac3cfe10b7196a7977e9c041c29fa141c35e;hp=8c79cce630922b12ece09f0ad9c0ad11cf5cad75;hpb=37a8d59548287dcad78ef00e7b18058721eb9935;p=fms.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c79cce..0cfa932 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 PROJECT(fms)
 
+OPTION(USE_BUNDLED_SQLITE "Use the bundled SQLite3 library" OFF)
+
 SET(FMS_SRC 
 src/base64.cpp
 src/board.cpp
@@ -15,10 +17,14 @@ src/messagelist.cpp
 src/option.cpp
 src/socketdefines.cpp
 src/stringfunctions.cpp
+src/threadcontroller.cpp
 src/uuidgenerator.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/fcpv2.cpp
 src/freenet/freenetmasterthread.cpp
 src/freenet/freenetssk.cpp
@@ -29,7 +35,6 @@ src/freenet/identityintroductionxml.cpp
 src/freenet/identityrequester.cpp
 src/freenet/identityxml.cpp
 src/freenet/introductionpuzzleinserter.cpp
-src/freenet/introductionpuzzleremover.cpp
 src/freenet/introductionpuzzlerequester.cpp
 src/freenet/introductionpuzzlexml.cpp
 src/freenet/messageinserter.cpp
@@ -38,6 +43,7 @@ src/freenet/messagelistrequester.cpp
 src/freenet/messagelistxml.cpp
 src/freenet/messagerequester.cpp
 src/freenet/messagexml.cpp
+src/freenet/periodicdbmaintenance.cpp
 src/freenet/trustlistinserter.cpp
 src/freenet/trustlistrequester.cpp
 src/freenet/trustlistxml.cpp
@@ -47,13 +53,19 @@ src/freenet/captcha/easybmp/EasyBMP.cpp
 src/freenet/captcha/easybmp/EasyBMP_Font.cpp
 src/freenet/captcha/easybmp/EasyBMP_Geometry.cpp
 src/http/httpthread.cpp
+src/http/identityexportxml.cpp
 src/http/ipagehandler.cpp
 src/http/pages/addpeerpage.cpp
 src/http/pages/announceidentitypage.cpp
+src/http/pages/boardspage.cpp
+src/http/pages/controlboardpage.cpp
 src/http/pages/createidentitypage.cpp
+src/http/pages/execquerypage.cpp
 src/http/pages/homepage.cpp
 src/http/pages/localidentitiespage.cpp
 src/http/pages/optionspage.cpp
+src/http/pages/peerdetailspage.cpp
+src/http/pages/peermaintenancepage.cpp
 src/http/pages/peertrustpage.cpp
 src/http/pages/showcaptchapage.cpp
 src/nntp/nntpconnection.cpp
@@ -67,9 +79,16 @@ src/pthreadwrapper/guard.cpp
 src/pthreadwrapper/mutex.cpp
 src/pthreadwrapper/runnable.cpp
 src/pthreadwrapper/thread.cpp
+src/pthreadwrapper/threadedexecutor.cpp
 src/xyssl/sha1.c
 )
 
+IF(WIN32)
+	SET(FMS_PLATFORM_SRC src/fmsservice.cpp)
+ELSE(WIN32)
+	SET(FMS_PLATFORM_SRC src/fmsdaemon.cpp)
+ENDIF(WIN32)
+
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 
 # was for ZThreads
@@ -78,18 +97,37 @@ ADD_DEFINITIONS(-DTIXML_USE_STL)
 #	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 #ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-ADD_EXECUTABLE(fms ${FMS_SRC})
+ADD_EXECUTABLE(fms ${FMS_SRC} ${FMS_PLATFORM_SRC})
 
-# For SQLite3 and shttpd
+# link dl - For SQLite3 and shttpd - not for FreeBSD
 IF(CMAKE_COMPILER_IS_GNUCC)
-	TARGET_LINK_LIBRARIES(fms dl)
+	IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	ELSE(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+		TARGET_LINK_LIBRARIES(fms dl)
+	ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
+# add -lcompat only for FreeBSD
+IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		TARGET_LINK_LIBRARIES(fms compat)
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+
+# link ws2_32 for Windows
 IF(WIN32)
 	TARGET_LINK_LIBRARIES(fms ws2_32)
 ENDIF(WIN32)
 
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)
+# add -lxnet and -lsocket on solaris
+IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+	TARGET_LINK_LIBRARIES(fms xnet)
+	TARGET_LINK_LIBRARIES(fms socket)
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+
+IF(NOT USE_BUNDLED_SQLITE)
+	FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)
+ENDIF(NOT USE_BUNDLED_SQLITE)
 FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)
 FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)
 FIND_LIBRARY(SHTTPD_LIBRARY NAMES shttpd)
@@ -97,7 +135,9 @@ FIND_LIBRARY(SHTTPD_LIBRARY NAMES shttpd)
 IF(SQLITE3_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
 ELSE(SQLITE3_LIBRARY)
-	MESSAGE(STATUS "Could not find system SQLite library.  Will compile from included source.")
+	IF(NOT USE_BUNDLED_SQLITE)
+		MESSAGE(STATUS "Could not find system SQLite library.  Will compile from included source.")
+	ENDIF(NOT USE_BUNDLED_SQLITE)
 	ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
 	TARGET_LINK_LIBRARIES(fms sqlite3)
 	INCLUDE_DIRECTORIES(libs/sqlite3)