diff options
| author | robot-ya-builder <[email protected]> | 2023-03-17 19:38:27 +0300 |
|---|---|---|
| committer | robot-ya-builder <[email protected]> | 2023-03-17 19:38:27 +0300 |
| commit | 26147c4e01ae75f397d4dd999da238bf2c61c851 (patch) | |
| tree | 873a652bca08f38df296c77422b40fd404f0481e /cmake/global_flags.compiler.msvc.cmake | |
| parent | 08f6d0d9bb84f493c5dfd3c0d1568445faa26d85 (diff) | |
External build system generator release 21
Update tools: yexport
Diffstat (limited to 'cmake/global_flags.compiler.msvc.cmake')
| -rw-r--r-- | cmake/global_flags.compiler.msvc.cmake | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/cmake/global_flags.compiler.msvc.cmake b/cmake/global_flags.compiler.msvc.cmake index 34cc3ff437b..4c08895cded 100644 --- a/cmake/global_flags.compiler.msvc.cmake +++ b/cmake/global_flags.compiler.msvc.cmake @@ -78,7 +78,8 @@ else() foreach(INCLUDE_PATH $ENV{INCLUDE}) if (INCLUDE_PATH MATCHES ".*\\\\Windows Kits\\\\[0-9]+\\\\include\\\\[0-9\\.]+\\\\ucrt$") message(VERBOSE "Found Y_UCRT_INCLUDE path \"${INCLUDE_PATH}\"") - string(APPEND _MSVC_COMMON_C_CXX_FLAGS " /DY_UCRT_INCLUDE=\"${INCLUDE_PATH}\"") + string(REPLACE "\\" "/" SAFE_INCLUDE_PATH "${INCLUDE_PATH}") + string(APPEND _MSVC_COMMON_C_CXX_FLAGS " /DY_UCRT_INCLUDE=\"${SAFE_INCLUDE_PATH}\"") set(UCRT_INCLUDE_FOUND true) break() endif() @@ -91,7 +92,8 @@ else() foreach(INCLUDE_PATH $ENV{INCLUDE}) if (INCLUDE_PATH MATCHES ".*VC\\\\Tools\\\\MSVC\\\\[0-9\\.]+\\\\include$") message(VERBOSE "Found Y_MSVC_INCLUDE path \"${INCLUDE_PATH}\"") - string(APPEND _MSVC_COMMON_C_CXX_FLAGS " /DY_MSVC_INCLUDE=\"${INCLUDE_PATH}\"") + string(REPLACE "\\" "/" SAFE_INCLUDE_PATH "${INCLUDE_PATH}") + string(APPEND _MSVC_COMMON_C_CXX_FLAGS " /DY_MSVC_INCLUDE=\"${SAFE_INCLUDE_PATH}\"") set(MSVC_INCLUDE_FOUND true) break() endif() @@ -113,6 +115,19 @@ foreach(WARN ${_WARNS_DISABLED}) string(APPEND _MSVC_COMMON_C_CXX_FLAGS " /wd${WARN}") endforeach() +if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$") + string(APPEND _MSVC_COMMON_C_CXX_FLAGS " \ + /D_WIN64 \ + /DWIN64 \ + /D__SSE2__ \ + /D__SSE3__ \ + /D__SSSE3__ \ + /D__SSE4_1__ \ + /D__SSE4_2__ \ + /D__POPCNT__ \ + ") +endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_MSVC_COMMON_C_CXX_FLAGS} \ ") @@ -125,16 +140,3 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_MSVC_COMMON_C_CXX_FLAGS} \ ") set(CMAKE_CXX_FLAGS_DEBUG "/Z7") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Z7") - -if ((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")) - set(CMAKE_C_FLAGS "\ - ${CMAKE_C_FLAGS} \ - /D_WIN64 \ - /DWIN64 \ - ") - set(CMAKE_CXX_FLAGS "\ - ${CMAKE_CXX_FLAGS} \ - /D_WIN64 \ - /DWIN64 \ - ") -endif() |