s [skip ci]

Author: firewave

cmake/compilerDefinitions.cmake

@@ -37,17 +37,24 @@ if(HAVE_RULES)
     add_definitions(-DHAVE_RULES)
 endif()
 
-if(USE_INT128)
+# Visual Studio has no native support
+if(USE_INT128 AND NOT MSVC)
     add_definitions(-DHAVE_INT128)
 endif()
 
 if(Boost_FOUND)
     add_definitions(-DHAVE_BOOST)
-    if(USE_INT128 AND USE_BOOST_INT128)
+    if(USE_INT128 STREQUAL "Boost")
         add_definitions(-DHAVE_BOOST_INT128)
     endif()
 endif()
 
+# Visual Studio falls back to Boost since it has no native 128-bit integer support
+if(USE_INT128 STREQUAL "Auto" AND Boost_FOUND)
+    add_definitions(-DHAVE_INT128)
+    add_definitions(-DHAVE_BOOST_INT128)
+endif()
+
 if(ENABLE_CHECK_INTERNAL)
     add_definitions(-DCHECK_INTERNAL)
 endif()

cmake/cxx11.cmake

@@ -1,5 +1,6 @@
 macro(use_cxx11)
-  if(USE_BOOST AND USE_BOOST_INT128)
+  # enable unconditionally for Visual Studio since it is the lowest possible standard to select
+  if(MSVC OR (USE_BOOST AND USE_INT128 STREQUAL "Boost"))
     # Boost.Math requires C++14
     set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to use")
   else()

cmake/options.cmake

@@ -92,17 +92,19 @@ option(DISALLOW_THREAD_EXECUTOR "Disallow usage of ThreadExecutor for -j"
 if(DISALLOW_THREAD_EXECUTOR AND WIN32)
     message(FATAL_ERROR "Cannot disable usage of ThreadExecutor on Windows as no other executor implementation is currently available")
 endif()
+
 set(USE_INT128 "Off" CACHE STRING "Usage of 128-bit integer type")  # TODO: default to Auto when working
-set_property(CACHE USE_INT128 PROPERTY STRINGS Auto Off On)
+set_property(CACHE USE_INT128 PROPERTY STRINGS Auto Off Native Boost)
+if (USE_INT128 STREQUAL "Native" AND MSVC)
+    message(FATAL_ERROR "Visual Studio has no native 128-bit integer support")
+endif()
+
 set(USE_BOOST "Auto" CACHE STRING "Usage of Boost")
 set_property(CACHE USE_BOOST PROPERTY STRINGS Auto Off On)
-set(USE_BOOST_INT128 "Off" CACHE STRING "Usage of Boost.Multiprecision 128-bit integer for Mathlib")   # TODO: default to Auto when working
-set_property(CACHE USE_BOOST_INT128 PROPERTY STRINGS Auto Off On)
-if (USE_INT128)
-    if (NOT USE_BOOST AND USE_BOOST_INT128)
-        message(FATAL_ERROR "USE_BOOST_INT128 requires USE_BOOST to be enabled")
-    endif()
+if (USE_INT128 STREQUAL "Boost" AND NOT USE_BOOST)
+    message(FATAL_ERROR "USE_INT128=Boost requires USE_BOOST to be enabled")
 endif()
+
 option(USE_LIBCXX           "Use libc++ instead of libstdc++"                               OFF)
 
 option(DISABLE_CRTDBG_MAP_ALLOC "Disable usage of Visual Studio C++ memory leak detection in Debug build" OFF)

cmake/printInfo.cmake

@@ -93,7 +93,6 @@ if(USE_BOOST)
     message(STATUS "Boost_FOUND =           ${Boost_FOUND}")
     message(STATUS "Boost_VERSION_STRING =  ${Boost_VERSION_STRING}")
     message(STATUS "Boost_INCLUDE_DIRS =    ${Boost_INCLUDE_DIRS}")
-    message(STATUS "USE_BOOST_INT128 =      ${USE_BOOST_INT128}")
 endif()
 message(STATUS)
 message(STATUS "USE_LIBCXX =            ${USE_LIBCXX}")