43 lines
2.0 KiB
Diff
43 lines
2.0 KiB
Diff
From eceecc5b2cade40e2ffe7e4ff4c7d2e16883961a Mon Sep 17 00:00:00 2001
|
|
From: Yann Collet <cyan@fb.com>
|
|
Date: Sun, 19 Jun 2022 14:52:32 -0700
|
|
Subject: [PATCH] removed explicit compilation standard from cmake script
|
|
|
|
it's not expected to be useful
|
|
and can actually lead to subtle side effects
|
|
such as #3163.
|
|
---
|
|
.../cmake/CMakeModules/AddZstdCompilationFlags.cmake | 12 +++++++-----
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
|
|
index e23b9d603e..8d04458c3e 100644
|
|
--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
|
|
+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
|
|
@@ -22,10 +22,12 @@ endfunction()
|
|
|
|
macro(ADD_ZSTD_COMPILATION_FLAGS)
|
|
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) #Not only UNIX but also WIN32 for MinGW
|
|
- #Set c++11 by default
|
|
- EnableCompilerFlag("-std=c++11" false true)
|
|
- #Set c99 by default
|
|
- EnableCompilerFlag("-std=c99" true false)
|
|
+ # It's possible to select the exact standard used for compilation.
|
|
+ # It's not necessary, but can be employed for specific purposes.
|
|
+ # Note that zstd source code is compatible with both C++98 and above
|
|
+ # and C-gnu90 (c90 + long long + variadic macros ) and above
|
|
+ # EnableCompilerFlag("-std=c++11" false true) # Set C++ compilation to c++11 standard
|
|
+ # EnableCompilerFlag("-std=c99" true false) # Set C compiation to c99 standard
|
|
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND MSVC)
|
|
# clang-cl normally maps -Wall to -Weverything.
|
|
EnableCompilerFlag("/clang:-Wall" true true)
|
|
@@ -48,7 +50,7 @@ macro(ADD_ZSTD_COMPILATION_FLAGS)
|
|
if (CMAKE_GENERATOR MATCHES "Visual Studio" AND ACTIVATE_MULTITHREADED_COMPILATION)
|
|
EnableCompilerFlag("/MP" true true)
|
|
endif ()
|
|
-
|
|
+
|
|
# UNICODE SUPPORT
|
|
EnableCompilerFlag("/D_UNICODE" true true)
|
|
EnableCompilerFlag("/DUNICODE" true true)
|