projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.11
[fms.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
52233e8
..
994d5e1
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-15,10
+15,14
@@
src/messagelist.cpp
src/option.cpp
\r
src/socketdefines.cpp
\r
src/stringfunctions.cpp
\r
src/option.cpp
\r
src/socketdefines.cpp
\r
src/stringfunctions.cpp
\r
+src/threadcontroller.cpp
\r
src/uuidgenerator.cpp
\r
src/db/sqlite3db.cpp
\r
src/db/sqlite3recordset.cpp
\r
src/db/sqlite3statement.cpp
\r
src/uuidgenerator.cpp
\r
src/db/sqlite3db.cpp
\r
src/db/sqlite3recordset.cpp
\r
src/db/sqlite3statement.cpp
\r
+src/freenet/boardlistinserter.cpp
\r
+src/freenet/boardlistrequester.cpp
\r
+src/freenet/boardlistxml.cpp
\r
src/freenet/fcpv2.cpp
\r
src/freenet/freenetmasterthread.cpp
\r
src/freenet/freenetssk.cpp
\r
src/freenet/fcpv2.cpp
\r
src/freenet/freenetmasterthread.cpp
\r
src/freenet/freenetssk.cpp
\r
@@
-29,7
+33,6
@@
src/freenet/identityintroductionxml.cpp
src/freenet/identityrequester.cpp
\r
src/freenet/identityxml.cpp
\r
src/freenet/introductionpuzzleinserter.cpp
\r
src/freenet/identityrequester.cpp
\r
src/freenet/identityxml.cpp
\r
src/freenet/introductionpuzzleinserter.cpp
\r
-src/freenet/introductionpuzzleremover.cpp
\r
src/freenet/introductionpuzzlerequester.cpp
\r
src/freenet/introductionpuzzlexml.cpp
\r
src/freenet/messageinserter.cpp
\r
src/freenet/introductionpuzzlerequester.cpp
\r
src/freenet/introductionpuzzlexml.cpp
\r
src/freenet/messageinserter.cpp
\r
@@
-38,6
+41,7
@@
src/freenet/messagelistrequester.cpp
src/freenet/messagelistxml.cpp
\r
src/freenet/messagerequester.cpp
\r
src/freenet/messagexml.cpp
\r
src/freenet/messagelistxml.cpp
\r
src/freenet/messagerequester.cpp
\r
src/freenet/messagexml.cpp
\r
+src/freenet/periodicdbmaintenance.cpp
\r
src/freenet/trustlistinserter.cpp
\r
src/freenet/trustlistrequester.cpp
\r
src/freenet/trustlistxml.cpp
\r
src/freenet/trustlistinserter.cpp
\r
src/freenet/trustlistrequester.cpp
\r
src/freenet/trustlistxml.cpp
\r
@@
-47,8
+51,19
@@
src/freenet/captcha/easybmp/EasyBMP.cpp
src/freenet/captcha/easybmp/EasyBMP_Font.cpp
\r
src/freenet/captcha/easybmp/EasyBMP_Geometry.cpp
\r
src/http/httpthread.cpp
\r
src/freenet/captcha/easybmp/EasyBMP_Font.cpp
\r
src/freenet/captcha/easybmp/EasyBMP_Geometry.cpp
\r
src/http/httpthread.cpp
\r
+src/http/identityexportxml.cpp
\r
src/http/ipagehandler.cpp
\r
src/http/ipagehandler.cpp
\r
+src/http/pages/addpeerpage.cpp
\r
+src/http/pages/announceidentitypage.cpp
\r
+src/http/pages/controlboardpage.cpp
\r
+src/http/pages/createidentitypage.cpp
\r
src/http/pages/homepage.cpp
\r
src/http/pages/homepage.cpp
\r
+src/http/pages/localidentitiespage.cpp
\r
+src/http/pages/optionspage.cpp
\r
+src/http/pages/peerdetailspage.cpp
\r
+src/http/pages/peermaintenancepage.cpp
\r
+src/http/pages/peertrustpage.cpp
\r
+src/http/pages/showcaptchapage.cpp
\r
src/nntp/nntpconnection.cpp
\r
src/nntp/nntplistener.cpp
\r
src/nntp/uwildmat.cpp
\r
src/nntp/nntpconnection.cpp
\r
src/nntp/nntplistener.cpp
\r
src/nntp/uwildmat.cpp
\r
@@
-60,16
+75,30
@@
src/pthreadwrapper/guard.cpp
src/pthreadwrapper/mutex.cpp
\r
src/pthreadwrapper/runnable.cpp
\r
src/pthreadwrapper/thread.cpp
\r
src/pthreadwrapper/mutex.cpp
\r
src/pthreadwrapper/runnable.cpp
\r
src/pthreadwrapper/thread.cpp
\r
+src/pthreadwrapper/threadedexecutor.cpp
\r
src/xyssl/sha1.c
\r
)
\r
\r
src/xyssl/sha1.c
\r
)
\r
\r
+IF(WIN32)
\r
+ SET(FMS_PLATFORM_SRC src/fmsservice.cpp)
\r
+ELSE(WIN32)
\r
+ SET(FMS_PLATFORM_SRC src/fmsdaemon.cpp)
\r
+ENDIF(WIN32)
\r
+
\r
ADD_DEFINITIONS(-DTIXML_USE_STL)
\r
\r
ADD_DEFINITIONS(-DTIXML_USE_STL)
\r
\r
-IF(CMAKE_COMPILER_IS_GNUCXX)
\r
- ADD_DEFINITIONS(-fpermissive)
\r
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
\r
+# was for ZThreads
\r
+#IF(CMAKE_COMPILER_IS_GNUCXX)
\r
+# #ADD_DEFINITIONS(-fpermissive)
\r
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
\r
+#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
\r
+
\r
+ADD_EXECUTABLE(fms ${FMS_SRC} ${FMS_PLATFORM_SRC})
\r
\r
\r
-ADD_EXECUTABLE(fms ${FMS_SRC})
\r
+# For SQLite3 and shttpd
\r
+IF(CMAKE_COMPILER_IS_GNUCC)
\r
+ TARGET_LINK_LIBRARIES(fms dl)
\r
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
\r
\r
IF(WIN32)
\r
TARGET_LINK_LIBRARIES(fms ws2_32)
\r
\r
IF(WIN32)
\r
TARGET_LINK_LIBRARIES(fms ws2_32)
\r
@@
-87,9
+116,6
@@
ELSE(SQLITE3_LIBRARY)
ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
\r
TARGET_LINK_LIBRARIES(fms sqlite3)
\r
INCLUDE_DIRECTORIES(libs/sqlite3)
\r
ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
\r
TARGET_LINK_LIBRARIES(fms sqlite3)
\r
INCLUDE_DIRECTORIES(libs/sqlite3)
\r
- IF(CMAKE_COMPILER_IS_GNUCC)
\r
- TARGET_LINK_LIBRARIES(fms dl)
\r
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
\r
ENDIF(SQLITE3_LIBRARY)
\r
\r
IF(TINYXML_LIBRARY)
\r
ENDIF(SQLITE3_LIBRARY)
\r
\r
IF(TINYXML_LIBRARY)
\r
@@
-111,9
+137,10
@@
IF(SHTTPD_LIBRARY)
TARGET_LINK_LIBRARIES(fms ${SHTTPD_LIBRARY})
\r
ELSE(SHTTPD_LIBRARY)
\r
MESSAGE(STATUS "Could not find shttpd library. Will compile from included source.")
\r
TARGET_LINK_LIBRARIES(fms ${SHTTPD_LIBRARY})
\r
ELSE(SHTTPD_LIBRARY)
\r
MESSAGE(STATUS "Could not find shttpd library. Will compile from included source.")
\r
- ADD_DEFINITIONS(-DEMBEDDED
-DNO_GUI
)
\r
+ ADD_DEFINITIONS(-DEMBEDDED)
\r
INCLUDE_DIRECTORIES(libs/shttpd/include)
\r
IF(WIN32)
\r
INCLUDE_DIRECTORIES(libs/shttpd/include)
\r
IF(WIN32)
\r
+ ADD_DEFINITIONS(-DNO_GUI)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_win32.c)
\r
ELSE(WIN32)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_unix.c)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_win32.c)
\r
ELSE(WIN32)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_unix.c)
\r