mirror of
https://github.com/VectorCamp/vectorscan.git
synced 2025-06-28 16:41:01 +03:00
Merge pull request #220 from VectorCamp/feature/fatruntime-enabled-on-x86
Feature/fatruntime enabled on x86
This commit is contained in:
commit
6e1c3a10fa
@ -23,7 +23,6 @@ INCLUDE (CheckLibraryExists)
|
|||||||
INCLUDE (CheckSymbolExists)
|
INCLUDE (CheckSymbolExists)
|
||||||
include (CMakeDependentOption)
|
include (CMakeDependentOption)
|
||||||
include (GNUInstallDirs)
|
include (GNUInstallDirs)
|
||||||
include (${CMAKE_MODULE_PATH}/platform.cmake)
|
|
||||||
include (${CMAKE_MODULE_PATH}/boost.cmake)
|
include (${CMAKE_MODULE_PATH}/boost.cmake)
|
||||||
include (${CMAKE_MODULE_PATH}/ragel.cmake)
|
include (${CMAKE_MODULE_PATH}/ragel.cmake)
|
||||||
|
|
||||||
@ -123,6 +122,10 @@ if (RELEASE_BUILD)
|
|||||||
add_definitions(-DNDEBUG)
|
add_definitions(-DNDEBUG)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Architecture detection
|
||||||
|
|
||||||
|
include (${CMAKE_MODULE_PATH}/platform.cmake)
|
||||||
|
|
||||||
# Detect OS and if Fat Runtime is available
|
# Detect OS and if Fat Runtime is available
|
||||||
include (${CMAKE_MODULE_PATH}/osdetection.cmake)
|
include (${CMAKE_MODULE_PATH}/osdetection.cmake)
|
||||||
|
|
||||||
|
@ -26,6 +26,9 @@ if (NOT FAT_RUNTIME)
|
|||||||
set(ARCH_CXX_FLAGS "-msse4.2")
|
set(ARCH_CXX_FLAGS "-msse4.2")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
|
set(BUILD_AVX512VBMI ON)
|
||||||
|
set(BUILD_AVX512 ON)
|
||||||
|
set(BUILD_AVX2 ON)
|
||||||
set(ARCH_C_FLAGS "-msse4.2")
|
set(ARCH_C_FLAGS "-msse4.2")
|
||||||
set(ARCH_CXX_FLAGS "-msse4.2")
|
set(ARCH_CXX_FLAGS "-msse4.2")
|
||||||
endif()
|
endif()
|
||||||
@ -129,5 +132,3 @@ else (NOT FAT_RUNTIME)
|
|||||||
message(FATAL_ERROR "A minimum of SSE4.2 compiler support is required")
|
message(FATAL_ERROR "A minimum of SSE4.2 compiler support is required")
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,7 +6,12 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
|||||||
set(FREEBSD true)
|
set(FREEBSD true)
|
||||||
endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
||||||
|
|
||||||
|
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)
|
option(FAT_RUNTIME "Build a library that supports multiple microarchitectures" OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (FAT_RUNTIME)
|
if (FAT_RUNTIME)
|
||||||
message("Checking Fat Runtime Requirements...")
|
message("Checking Fat Runtime Requirements...")
|
||||||
if (NOT LINUX)
|
if (NOT LINUX)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user