Added Wt 4 branch

Author: RockinRoel

CMakeLists.txt

@@ -59,7 +59,7 @@ IF(ANDROID)
   ENDIF(NOT DEFINED ANDROID_SDK_TARGET_ID)
 
   SET(SHARED_LIBS OFF)
-  add_definitions(-DANDROID -DWT_NO_STD_WSTRING=ON -DWT_NO_STD_LOCALE=ON)
+  add_definitions(-DANDROID) # TODO(Roel): WT_NO_STD_WSTRING/WT_NO_STD_LOCALE?
 ENDIF(ANDROID)
 
 #
@@ -110,31 +110,10 @@ OPTION(WT_NO_STD_LOCALE "Build Wt to run on a system without std::locale support
 OPTION(WT_NO_STD_WSTRING "Build Wt to run on a system without std::wstring support" OFF)
 OPTION(ENABLE_OPENGL "Build Wt with support for server-side opengl rendering" ON)
 
-# C++11 vs C++98
-# Binary compatibility is not guaranteed. We give our users the choice on
-# how to compile Wt
-# We're not sure yet if you can safely link Wt compiled in 03 mode against
-# an application compiled in 11 mode. Boost probably causes problems here
-# (specially boost.signals2)
 IF(NOT MSVC)
-  # For now, don't auto-detect
-  #IF(CMAKE_COMPILER_IS_GNUCXX)
-  #  execute_process(COMMAND ${CMAKE_C_COMPILER} "-dumpversion"
-  #                  OUTPUT_VARIABLE GCC_VERSION)
-  #  IF(${GCC_VERSION} VERSION_GREATER "4.5.99")
-  #    SET(HAS_CXX11 ON)
-  #  ENDIF(${GCC_VERSION} VERSION_GREATER "4.5.99")
-  #ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-  SET(WT_CPP_11_MODE "" CACHE STRING "C++ mode to compile Wt in (leave empty for your compiler's default, or set to -std=c++11, -std=c++0x, ...)")
-  IF(WT_CPP_11_MODE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WT_CPP_11_MODE}")
-    SET(HAS_CXX11 ON)
-  ENDIF(WT_CPP_11_MODE)
-ELSE(NOT MSVC)
-  # For once, msvs is easier than gcc/llvm
-  IF(MSVC_VERSION GREATER 1600)
-    SET(HAS_CXX11 ON)
-  ENDIF(MSVC_VERSION GREATER 1600)
+  #MSVC always enables its c++11 features by default
+  SET(WT_CPP_11_MODE "-std=c++11" CACHE STRING "C++ mode to compile Wt in (defaults to -std=c++11, you can set it to -std=c++11, -std=c++0x, -std=c++14,...)")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WT_CPP_11_MODE}")
 ENDIF(NOT MSVC)
 
 IF(MSVC)
@@ -298,6 +277,7 @@ SET(GM_PREFIX ${USERLIB_PREFIX} CACHE PATH
   "Installation prefix of GraphicsMagick library (overrides USERLIB_PREFIX)")
 SET(SKIA_PREFIX ${USERLIB_PREFIX} CACHE PATH
   "Prefix of skia library (overrides USERLIB_PREFIX)")
+SET(WT_TZDATA_INSTALL "." CACHE PATH "The location where the time zone data is installed (defaults to current working directory)")
 
 OPTION(DEBUG "Support for debugging, must be enabled also in wt_config.xml" OFF)
 
@@ -387,8 +367,7 @@ IF(NOT BOOST_WT_FOUND)
       "Note 2: the code to discover boost is located in cmake/WtFindBoost.txt\n"
       "Note 3: on windows, set BOOST_PREFIX to the full path, eg "
       "c:/Program Files/boost/boost_1_38\n\n"
-      "Note 4: if you do not have boost.random, set WT_NO_BOOST_RANDOM to ON"
-      "Wt requires the following C++ boost libraries: date_time, regex, program_options, signals, random, and optionally thread")
+      "Wt requires the following C++ boost libraries: program_options and random")
   MESSAGE(FATAL_ERROR ${ERR})
 ENDIF(NOT BOOST_WT_FOUND)
 
@@ -410,34 +389,6 @@ ELSE(BOOST_WT_MT_FOUND)
   ADD_DEFINITIONS(-DBOOST_DISABLE_THREADS -DSQLITE_THREADSAFE=0)
 ENDIF(BOOST_WT_MT_FOUND)
 
-# decide on signals vs signals2
-# boost 1.54 deprecated boost signals -> use signals2
-IF (Boost_VERSION GREATER 105300)
-  MESSAGE(STATUS "Boost ${Boost_VERSION} > 1.53, WT_SIGNALS_IMPLEMENTATION = boost.signals2 recommended")
-  SET(DEFAULT_WT_SIGNALS_IMPLEMENTATION "boost.signals2")
-ELSE (Boost_VERSION GREATER 105300)
-  SET(DEFAULT_WT_SIGNALS_IMPLEMENTATION "boost.signals")
-  MESSAGE(STATUS "Boost ${Boost_VERSION} < 1.54, WT_SIGNALS_IMPLEMENTATION = boost.signals recommended")
-ENDIF (Boost_VERSION GREATER 105300)
-SET(WT_SIGNALS_IMPLEMENTATION ${DEFAULT_WT_SIGNALS_IMPLEMENTATION} CACHE STRING "Select what implementation should be used for Wt signals")
-IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
-  MESSAGE(STATUS "Informational: WT_SIGNALS_IMPLEMENTATION should be either boost.signals or boost.signals2")
-ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
-  SET_PROPERTY(CACHE WT_SIGNALS_IMPLEMENTATION PROPERTY STRINGS boost.signals boost.signals2)
-ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
-
-
-IF ("${WT_SIGNALS_IMPLEMENTATION}" STREQUAL "boost.signals")
-  MESSAGE(STATUS "Selecting boost.signals")
-  SET(WT_USE_BOOST_SIGNALS ON)
-  SET(WT_USE_BOOST_SIGNALS2 OFF)
-ELSEIF ("${WT_SIGNALS_IMPLEMENTATION}" STREQUAL "boost.signals2")
-  MESSAGE(STATUS "Selecting boost.signals2")
-  SET(WT_USE_BOOST_SIGNALS OFF)
-  SET(WT_USE_BOOST_SIGNALS2 ON)
-ENDIF ("${WT_SIGNALS_IMPLEMENTATION}" STREQUAL "boost.signals")
-
-
 # decide on GraphicsMagick vs skia
 # todo: set default to whatever was found
 SET(WT_WRASTERIMAGE_DEFAULT_IMPLEMENTATION "none")
@@ -462,6 +413,26 @@ ELSE (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick")
     MESSAGE("** Disabled WRasterimage support. Set WT_WRASTERIMAGE_IMPLEMENTATION to GraphicsMagick or skia.")
 ENDIF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick")
 
+SET(WT_CPP17_ANY_DEFAULT_IMPLEMENTATION "thelink2012")
+SET(WT_CPP17_ANY_IMPLEMENTATION ${WT_CPP17_ANY_DEFAULT_IMPLEMENTATION} CACHE STRING
+"Implementation for Wt::cpp17::any. Defaults to \"thelink2012\": an included implementation of any by GitHub user thelink2012. Use \"std\" for std::any, or \"experimental\" for std::experimental::any, if compiler support is available. You may have to change WT_CPP_11_MODE to enable C++17 support in the compiler.")
+   
+IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+  MESSAGE(STATUS "Informational: WT_CPP17_ANY_IMPLEMENTATION should be thelink2012, experimental, or std")
+ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+  SET_PROPERTY(CACHE WT_CPP17_ANY_IMPLEMENTATION PROPERTY STRINGS thelink2012 experimental std)
+ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+
+IF (${WT_CPP17_ANY_IMPLEMENTATION} STREQUAL "thelink2012")
+  SET(WT_ANY_IS_THELINK2012_ANY ON)
+ELSEIF (${WT_CPP17_ANY_IMPLEMENTATION} STREQUAL "experimental")
+  SET(WT_ANY_IS_EXPERIMENTAL_ANY ON)
+ELSEIF (${WT_CPP17_ANY_IMPLEMENTATION} STREQUAL "std")
+  SET(WT_ANY_IS_STD_ANY ON)
+ELSE (${WT_CPP17_ANY_IMPLEMENTATION} STREQUAL "thelink2012")
+  MESSAGE(FATAL_ERROR "WT_CPP17_ANY_IMPLEMENTATION must be one of thelink2012, experimental, or std")
+ENDIF (${WT_CPP17_ANY_IMPLEMENTATION} STREQUAL "thelink2012")
+
 FIND_PACKAGE(Doxygen)
 
 # Boost is used nearly everywhere, so we can put these here

WConfig.h.in

@@ -19,31 +19,25 @@
 #define WT_CONFIG_XML "${CONFIGURATION}"
 #define WTHTTP_CONFIGURATION "${WTHTTP_CONFIGURATION}"
 
-
 #cmakedefine WT_STATIC
 #cmakedefine WTDBO_STATIC
 #cmakedefine WTDBOPOSTGRES_STATIC
 #cmakedefine WTDBOSQLITE3_STATIC
 #cmakedefine WTDBOFIREBIRD_STATIC
 #cmakedefine WTDBOMYSQL_STATIC
 #cmakedefine WTHTTP_STATIC
-#cmakedefine WT_EXT_STATIC
-#cmakedefine WT_EXT_STATIC
 
 #cmakedefine WT_HAS_WRASTERIMAGE
 #cmakedefine WT_HAS_WPDFIMAGE
 #cmakedefine WT_WITH_SSL
 
-#cmakedefine WT_NO_BOOST_INTRUSIVE
-#cmakedefine WT_NO_BOOST_RANDOM
-#cmakedefine WT_NO_STD_LOCALE
-#cmakedefine WT_NO_STD_WSTRING
 #cmakedefine WT_USE_OPENGL
 #cmakedefine WT_DEBUG_ENABLED
 #cmakedefine WT_THREADED
 
-#cmakedefine WT_USE_BOOST_SIGNALS
-#cmakedefine WT_USE_BOOST_SIGNALS2
+#cmakedefine WT_ANY_IS_THELINK2012_ANY
+#cmakedefine WT_ANY_IS_EXPERIMENTAL_ANY
+#cmakedefine WT_ANY_IS_STD_ANY
 
 // our win32: WIN32 (gcc) or _WIN32 (MSC)
 #if defined(WIN32) || defined(_WIN32)

cmake/WtFindBoost-cmake.txt

@@ -9,11 +9,8 @@
 # - BOOST_WT_LIBRARIES
 #
 # Separate compiled boost libraries are also discovered:
-# - BOOST_DT_LIB
 # - BOOST_FS_LIB
-# - BOOST_REGEX_LIB
 # - BOOST_PO_LIB
-# - BOOST_SIGNALS_LIB
 # - BOOST_SYSTEM_LIB
 # - BOOST_THREAD_LIB (only if BOOST_MT_FOUND)
 # Boost will try to find the same kind (mt or not) of library for all three
@@ -55,25 +52,12 @@ ENDIF(WIN32)
 
 SET(Boost_DEBUG ON)
 
-OPTION(WT_NO_BOOST_RANDOM "For compatibility with older boost versions. Do not enable for boost > 1.45" OFF)
-MESSAGE("WT_NO_BOOST_RANDOM is ${WT_NO_BOOST_RANDOM}")
-
 SET(Boost_COMPONENTS
-    date_time
-    regex
     program_options
-    signals
     system
     filesystem
     thread
 )
-IF(NOT WT_NO_BOOST_RANDOM)
-  SET(Boost_COMPONENTS
-    ${Boost_COMPONENTS}
-    random
-  )
-ENDIF(NOT WT_NO_BOOST_RANDOM)
-
 
 FIND_PACKAGE(Boost 1.35
   COMPONENTS
@@ -85,16 +69,10 @@ IF (Boost_FOUND)
   # Translate variables from official cmake names to internally used names
   SET(BOOST_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
   SET(BOOST_LIB_DIRS ${Boost_LIBRARY_DIRS})
-  SET(BOOST_DT_LIB ${Boost_DATE_TIME_LIBRARY})
   SET(BOOST_FS_LIB ${Boost_FILESYSTEM_LIBRARY})
-  SET(BOOST_REGEX_LIB ${Boost_REGEX_LIBRARY})
   SET(BOOST_PO_LIB ${Boost_PROGRAM_OPTIONS_LIBRARY})
-  SET(BOOST_SIGNALS_LIB ${Boost_SIGNALS_LIBRARY})
   SET(BOOST_SYSTEM_LIB ${Boost_SYSTEM_LIBRARY})
   SET(BOOST_THREAD_LIB ${Boost_THREAD_LIBRARY})
-  IF(NOT WT_NO_BOOST_RANDOM)
-    SET(BOOST_RANDOM_LIB ${Boost_RANDOM_LIBRARY})
-  ENDIF(NOT WT_NO_BOOST_RANDOM)
 
   SET(BOOST_WT_MT_FOUND TRUE)
   SET(BOOST_WT_FOUND TRUE)
@@ -108,17 +86,12 @@ IF (Boost_FOUND)
   ELSE(MSVC)
     SET(BOOST_WT_LIBRARIES
         ${Boost_THREAD_LIBRARY}
-        ${BOOST_RANDOM_LIB}
-        ${Boost_REGEX_LIBRARY}
-        ${Boost_SIGNALS_LIBRARY}
         ${Boost_SYSTEM_LIBRARY}
-        ${Boost_FILESYSTEM_LIBRARY}
-        ${Boost_DATE_TIME_LIBRARY})
+        ${Boost_FILESYSTEM_LIBRARY})
     SET(BOOST_WTHTTP_LIBRARIES
         ${Boost_THREAD_LIBRARY}
         ${Boost_PROGRAM_OPTIONS_LIBRARY}
         ${Boost_SYSTEM_LIBRARY}
-        ${Boost_FILESYSTEM_LIBRARY}
-        ${Boost_DATE_TIME_LIBRARY})
+        ${Boost_FILESYSTEM_LIBRARY})
   ENDIF(MSVC)
 ENDIF (Boost_FOUND)