CMake: Fix version parsing and allow Unix flags on Clang

diff --git a/build/cmake/CMakeModules/AddExtraCompilationFlags.cmake b/build/cmake/CMakeModules/AddExtraCompilationFlags.cmake
index db5b48124e3f982c750103b9b2e0aab7e25ebc91..e099a01da31046a2ebb5a3f96743c78e0b409683 100644 (file)
--- a/build/cmake/CMakeModules/AddExtraCompilationFlags.cmake
+++ b/build/cmake/CMakeModules/AddExtraCompilationFlags.cmake
@@ -20,7 +20,7 @@ function(EnableCompilerFlag _flag _C _CXX)
 endfunction()
 
 MACRO(ADD_EXTRA_COMPILATION_FLAGS)
-    if (CMAKE_COMPILER_IS_GNUCXX OR MINGW) #Not only UNIX but also WIN32 for MinGW
+    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

diff --git a/build/cmake/CMakeModules/GetLibraryVersion.cmake b/build/cmake/CMakeModules/GetLibraryVersion.cmake
index a3e2fd25f46bb05024c7bbc5a133ba6c018c8a76..95d84a89f22eadddd6a16437021152e0fe4a2957 100644 (file)
--- a/build/cmake/CMakeModules/GetLibraryVersion.cmake
+++ b/build/cmake/CMakeModules/GetLibraryVersion.cmake
@@ -2,7 +2,7 @@ function(GetLibraryVersion _header _major _minor _release)
     # Read file content
     FILE(READ ${_header} CONTENT)
 
-    string(REGEX MATCHALL ".*define ZSTD_VERSION_MAJOR+.* ([0-9]+).*define ZSTD_VERSION_MINOR+.* ([0-9]+).*define ZSTD_VERSION_RELEASE+.* ([0-9]+)" VERSION_REGEX "${CONTENT}")
+    string(REGEX MATCH ".*define ZSTD_VERSION_MAJOR *([0-9]+).*define ZSTD_VERSION_MINOR *([0-9]+).*define ZSTD_VERSION_RELEASE *([0-9]+)" VERSION_REGEX "${CONTENT}")
     SET(${_major} ${CMAKE_MATCH_1} PARENT_SCOPE)
     SET(${_minor} ${CMAKE_MATCH_2} PARENT_SCOPE)
     SET(${_release} ${CMAKE_MATCH_3} PARENT_SCOPE)