Enable Fat runtime on x86 by default to help migration from hyperscan

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d256e7ed95f8529f2a70dc669b70787d075c325d..0cf3c0f82015dd769b034f5d101d565f2b959d31 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,6 @@ INCLUDE (CheckLibraryExists)
 INCLUDE (CheckSymbolExists)
 include (CMakeDependentOption)
 include (GNUInstallDirs)
-include (${CMAKE_MODULE_PATH}/platform.cmake)
 include (${CMAKE_MODULE_PATH}/boost.cmake)
 include (${CMAKE_MODULE_PATH}/ragel.cmake)
 
@@ -123,6 +122,10 @@ if (RELEASE_BUILD)
     add_definitions(-DNDEBUG)
 endif()
 
+# Architecture detection
+
+include (${CMAKE_MODULE_PATH}/platform.cmake)
+
 # Detect OS and if Fat Runtime is available
 include (${CMAKE_MODULE_PATH}/osdetection.cmake)
 

diff --git a/cmake/osdetection.cmake b/cmake/osdetection.cmake
index 343e16b50c6c7ab18c4ae19bd97b1cffdbc1768a..59f2b342e511dc7feadf189733df76eaea163b8e 100644 (file)
--- a/cmake/osdetection.cmake
+++ b/cmake/osdetection.cmake
@@ -6,7 +6,12 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
     set(FREEBSD true)
 endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 
-option(FAT_RUNTIME "Build a library that supports multiple microarchitectures" OFF)
+if (ARCH_IA32 OR ARCH_X86_64)
+  option(FAT_RUNTIME "Build a library that supports multiple microarchitectures" ON)
+else()
+  option(FAT_RUNTIME "Build a library that supports multiple microarchitectures" OFF)
+endif()
+
 if (FAT_RUNTIME)
     message("Checking Fat Runtime Requirements...")
     if (NOT LINUX)