X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=CMakeLists.txt;h=f5dd4531d31dd66d2e5f2aefec31941c758fa7b0;hb=9b22dd53fe62e312c1647310b7ec43aa127090af;hp=986d1ba51154372e002c1e3aa0d94f39ff6abef5;hpb=7ddb1aeb0b3dc7384597e75f7b3557f2d8f6d14c;p=fms.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986d1ba..f5dd453 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,20 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+IF(COMMAND CMAKE_POLICY)
+	CMAKE_POLICY(SET CMP0003 OLD)
+ENDIF(COMMAND CMAKE_POLICY)
+
 PROJECT(fms)
 
 OPTION(USE_BUNDLED_SQLITE "Use the bundled SQLite3 library." OFF)
-OPTION(DO_CHARSET_CONVERSION "Do charset conversion on sent messages to UTF-8.  This requires libiconv." OFF)
+IF(APPLE)
+	SET(USE_BUNDLED_SQLITE ON)
+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)
 
 SET(FMS_SRC 
 src/base64.cpp
+src/bitmapvalidator.cpp
 src/board.cpp
 src/boardlist.cpp
 src/commandthread.cpp
@@ -62,6 +72,7 @@ src/http/ipagehandler.cpp
 src/http/pages/addpeerpage.cpp
 src/http/pages/announceidentitypage.cpp
 src/http/pages/boardspage.cpp
+src/http/pages/confirmpage.cpp
 src/http/pages/controlboardpage.cpp
 src/http/pages/createidentitypage.cpp
 src/http/pages/execquerypage.cpp
@@ -99,6 +110,10 @@ ELSE(WIN32)
 	SET(FMS_PLATFORM_SRC src/fmsdaemon.cpp)
 ENDIF(WIN32)
 
+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)
+
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 
 # was for ZThreads
@@ -147,7 +162,7 @@ IF(SQLITE3_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
 ELSE(SQLITE3_LIBRARY)
 	IF(NOT USE_BUNDLED_SQLITE)
-		MESSAGE(STATUS "Could not find system SQLite library.  Will compile from included source.")
+		MESSAGE(STATUS "Could not find system SQLite3 library.  Will compile from included source.")
 	ENDIF(NOT USE_BUNDLED_SQLITE)
 	ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
 	TARGET_LINK_LIBRARIES(fms sqlite3)
@@ -166,7 +181,7 @@ ENDIF(TINYXML_LIBRARY)
 IF(PTHREADS_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${PTHREADS_LIBRARY})
 ELSE(PTHREADS_LIBRARY)
-	MESSAGE(FATAL ERROR "Could not find pthreads library.  You must set the location manually.")
+	MESSAGE(FATAL_ERROR "Could not find pthreads library.  You must set the location manually.")
 ENDIF(PTHREADS_LIBRARY)
 
 IF(SHTTPD_LIBRARY)
@@ -191,7 +206,7 @@ IF(DO_CHARSET_CONVERSION)
 		TARGET_LINK_LIBRARIES(fms ${ICONV_LIBRARY})
 	ELSE(ICONV_LIBRARY)
 		IF(WIN32)
-			MESSAGE(FATAL ERROR "Could not find iconv library.  You must set the location manually, or turn off charset conversion.")
+			MESSAGE(FATAL_ERROR "Could not find iconv library.  You must set the location manually, or turn off charset conversion.")
 		ENDIF(WIN32)
 	ENDIF(ICONV_LIBRARY)
 ENDIF(DO_CHARSET_CONVERSION)