version 0.2.23

[fms.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfb7d40..f5dd453 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,10 +6,15 @@ ENDIF(COMMAND CMAKE_POLICY)
 PROJECT(fms)\r
 \r
 OPTION(USE_BUNDLED_SQLITE "Use the bundled SQLite3 library." OFF)\r
-OPTION(DO_CHARSET_CONVERSION "Do charset conversion on sent messages to UTF-8.  This requires libiconv." OFF)\r
+IF(APPLE)\r
+       SET(USE_BUNDLED_SQLITE ON)\r
+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
 \r
 SET(FMS_SRC \r
 src/base64.cpp\r
+src/bitmapvalidator.cpp\r
 src/board.cpp\r
 src/boardlist.cpp\r
 src/commandthread.cpp\r
@@ -105,6 +110,10 @@ ELSE(WIN32)
        SET(FMS_PLATFORM_SRC src/fmsdaemon.cpp)\r
 ENDIF(WIN32)\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
+\r
 ADD_DEFINITIONS(-DTIXML_USE_STL)\r
 \r
 # was for ZThreads\r
@@ -153,7 +162,7 @@ IF(SQLITE3_LIBRARY)
        TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})\r
 ELSE(SQLITE3_LIBRARY)\r
        IF(NOT USE_BUNDLED_SQLITE)\r
-               MESSAGE(STATUS "Could not find system SQLite library.  Will compile from included source.")\r
+               MESSAGE(STATUS "Could not find system SQLite3 library.  Will compile from included source.")\r
        ENDIF(NOT USE_BUNDLED_SQLITE)\r
        ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)\r
        TARGET_LINK_LIBRARIES(fms sqlite3)\r
@@ -172,7 +181,7 @@ ENDIF(TINYXML_LIBRARY)
 IF(PTHREADS_LIBRARY)\r
        TARGET_LINK_LIBRARIES(fms ${PTHREADS_LIBRARY})\r
 ELSE(PTHREADS_LIBRARY)\r
-       MESSAGE(FATAL ERROR "Could not find pthreads library.  You must set the location manually.")\r
+       MESSAGE(FATAL_ERROR "Could not find pthreads library.  You must set the location manually.")\r
 ENDIF(PTHREADS_LIBRARY)\r
 \r
 IF(SHTTPD_LIBRARY)\r
@@ -197,7 +206,7 @@ IF(DO_CHARSET_CONVERSION)
                TARGET_LINK_LIBRARIES(fms ${ICONV_LIBRARY})\r
        ELSE(ICONV_LIBRARY)\r
                IF(WIN32)\r
-                       MESSAGE(FATAL ERROR "Could not find iconv library.  You must set the location manually, or turn off charset conversion.")\r
+                       MESSAGE(FATAL_ERROR "Could not find iconv library.  You must set the location manually, or turn off charset conversion.")\r
                ENDIF(WIN32)\r
        ENDIF(ICONV_LIBRARY)\r
 ENDIF(DO_CHARSET_CONVERSION)\r