Skip to content

Commit 5b6fa14

Browse files
committed
Fixed bug where AVX would be enabled for debug, now its disabled by default: KasperskyLab#137
1 parent 378909f commit 5b6fa14

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
2525

2626
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
2727

28-
message(STATUS "cmake version ${CMAKE_VERSION}")
2928
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
3029
# cmake > 4.0 does not support projects with minimal versions < 3.5
3130
message(STATUS "Changing cmake minimum version to 3.5 globally")
@@ -137,12 +136,11 @@ else()
137136
set(KNP_BUILD_AUTONOMOUS FALSE)
138137
endif()
139138

140-
if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
139+
set(KNP_ENABLE_AVX_DEFAULT OFF)
140+
if (CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
141141
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
142142
set(KNP_ENABLE_AVX_DEFAULT ON)
143143
endif()
144-
else()
145-
set(KNP_ENABLE_AVX_DEFAULT OFF)
146144
endif()
147145

148146
if (KNP_BUILD_AUTONOMOUS OR KNP_MAINTAINER_BUILD)

0 commit comments

Comments
 (0)