summaryrefslogtreecommitdiffhomepage
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/msvc.cmake12
-rw-r--r--cmake/opentrack-platform.cmake1
2 files changed, 10 insertions, 3 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index 311e261c..b390c120 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -112,11 +112,10 @@ endif()
set(opentrack-simd "SSE2")
if(CMAKE_PROJECT_NAME STREQUAL "onnxruntime")
- set(opentrack-simd "AVX")
sets(BOOL
ONNX_USE_MSVC_STATIC_RUNTIME OFF
protobuf_MSVC_STATIC_RUNTIME OFF
- onnxruntime_USE_AVX ON
+ onnxruntime_USE_AVX OFF
onnxruntime_USE_AVX2 OFF
onnxruntime_USE_AVX512 OFF
onnxruntime_BUILD_BENCHMARKS OFF
@@ -132,7 +131,14 @@ if(CMAKE_PROJECT_NAME STREQUAL "onnxruntime")
onnxruntime_DISABLE_CONTRIB_OPS ON
BUILD_TESTING OFF
)
-elseif(opentrack-64bit)
+ if(opentrack-64bit)
+ sets(BOOL
+ onnxruntime_USE_AVX ON
+ )
+ endif()
+endif()
+
+if(opentrack-64bit)
set(opentrack-simd "AVX")
endif()
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index f7db0dc8..638260f1 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -137,6 +137,7 @@ if(MSVC)
add_link_options(-ignore:4020)
add_link_options(-ignore:4217) # debug build
+
if(MSVC_VERSION GREATER_EQUAL 1913)
if(NOT MSVC_VERSION GREATER_EQUAL 1929)
add_compile_options(-experimental:external)