From: Artyom Dymchenko <Artem.Dymchenko@noveogroup.com>
Date: Thu, 7 Jan 2016 10:37:00 +0000 (+0600)
Subject: CMake build (Linux and Windows MSVC tested only) integration support added;
X-Git-Tag: v0.4.6~1^2~4^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e0837a985e3b8b7103a6f89e017dc8b70daac8;p=thirdparty%2Fzstd.git

CMake build (Linux and Windows MSVC tested only) integration support added;
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..994416978
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,53 @@
+# ################################################################
+# zstd - Makefile
+# Copyright (C) Yann Collet 2014-2015
+# All rights reserved.
+# 
+# BSD license
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# 
+# * Redistributions in binary form must reproduce the above copyright notice, this
+#   list of conditions and the following disclaimer in the documentation and/or
+#   other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# You can contact the author at :
+#  - zstd source repository : https://github.com/Cyan4973/zstd
+#  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+# ################################################################
+project(zstd)
+cmake_minimum_required(VERSION 2.8.12)
+
+OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF)
+
+IF (ZSTD_LEGACY_SUPPORT)
+    message(STATUS "ZSTD_LEGACY_SUPPORT defined!")
+    add_definitions(-DZSTD_LEGACY_SUPPORT=1)
+ELSE (ZSTD_LEGACY_SUPPORT)
+    message(STATUS "ZSTD_LEGACY_SUPPORT not defined!")
+    add_definitions(-DZSTD_LEGACY_SUPPORT=0)
+ENDIF (ZSTD_LEGACY_SUPPORT)
+
+add_subdirectory(lib)
+add_subdirectory(programs)
+
+#-----------------------------------------------------------------------------
+# Add extra compilation flags
+#-----------------------------------------------------------------------------
+include(CMakeModules/AddExtraCompilationFlags.cmake)
+ADD_EXTRA_COMPILATION_FLAGS()
\ No newline at end of file
diff --git a/CMakeModules/AddExtraCompilationFlags.cmake b/CMakeModules/AddExtraCompilationFlags.cmake
new file mode 100644
index 000000000..1e60aba3d
--- /dev/null
+++ b/CMakeModules/AddExtraCompilationFlags.cmake
@@ -0,0 +1,257 @@
+MACRO(ADD_EXTRA_COMPILATION_FLAGS)
+    include(CheckCXXCompilerFlag)
+    include(CheckCCompilerFlag)
+    if (CMAKE_COMPILER_IS_GNUCXX OR MINGW) #Not only UNIX but also WIN32 for MinGW
+
+        set(POSITION_INDEPENDENT_CODE_FLAG "-fPIC")
+        CHECK_C_COMPILER_FLAG(${POSITION_INDEPENDENT_CODE_FLAG} POSITION_INDEPENDENT_CODE_FLAG_ALLOWED)
+        if (POSITION_INDEPENDENT_CODE_FLAG_ALLOWED)
+            MESSAGE("Compiler flag ${POSITION_INDEPENDENT_CODE_FLAG} allowed")
+            set(ACTIVATE_POSITION_INDEPENDENT_CODE_FLAG "ON" CACHE BOOL "activate -fPIC flag")
+        else ()
+            MESSAGE("Compiler flag ${POSITION_INDEPENDENT_CODE_FLAG} not allowed")
+        endif (POSITION_INDEPENDENT_CODE_FLAG_ALLOWED)
+
+        set(WARNING_UNDEF "-Wundef")
+        CHECK_C_COMPILER_FLAG(${WARNING_UNDEF} WARNING_UNDEF_ALLOWED)
+        if (WARNING_UNDEF_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_UNDEF} allowed")
+            set(ACTIVATE_WARNING_UNDEF "ON" CACHE BOOL "activate -Wundef flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_UNDEF} not allowed")
+        endif (WARNING_UNDEF_ALLOWED)
+
+        set(WARNING_SHADOW "-Wshadow")
+        CHECK_C_COMPILER_FLAG(${WARNING_SHADOW} WARNING_SHADOW_ALLOWED)
+        if (WARNING_SHADOW_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_SHADOW} allowed")
+            set(ACTIVATE_WARNING_SHADOW "ON" CACHE BOOL "activate -Wshadow flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_SHADOW} not allowed")
+        endif (WARNING_SHADOW_ALLOWED)
+
+        set(WARNING_CAST_ALIGN "-Wcast-align")
+        CHECK_C_COMPILER_FLAG(${WARNING_CAST_ALIGN} WARNING_CAST_ALIGN_ALLOWED)
+        if (WARNING_CAST_ALIGN_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_CAST_ALIGN} allowed")
+            set(ACTIVATE_WARNING_CAST_ALIGN "ON" CACHE BOOL "activate -Wcast-align flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_CAST_ALIGN} not allowed")
+        endif (WARNING_CAST_ALIGN_ALLOWED)
+
+        set(WARNING_CAST_QUAL "-Wcast-qual")
+        CHECK_C_COMPILER_FLAG(${WARNING_CAST_QUAL} WARNING_CAST_QUAL_ALLOWED)
+        if (WARNING_CAST_QUAL_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_CAST_QUAL} allowed")
+            set(ACTIVATE_WARNING_CAST_QUAL "ON" CACHE BOOL "activate -Wcast-qual flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_CAST_QUAL} not allowed")
+        endif (WARNING_CAST_QUAL_ALLOWED)
+
+        set(WARNING_STRICT_PROTOTYPES "-Wstrict-prototypes")
+        CHECK_C_COMPILER_FLAG(${WARNING_STRICT_PROTOTYPES} WARNING_STRICT_PROTOTYPES_ALLOWED)
+        if (WARNING_STRICT_PROTOTYPES_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_STRICT_PROTOTYPES} allowed")
+            set(ACTIVATE_WARNING_STRICT_PROTOTYPES "ON" CACHE BOOL "activate -Wstrict-prototypes flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_STRICT_PROTOTYPES} not allowed")
+        endif (WARNING_STRICT_PROTOTYPES_ALLOWED)
+
+        set(WARNING_ALL "-Wall")
+        CHECK_C_COMPILER_FLAG(${WARNING_ALL} WARNING_ALL_ALLOWED)
+        if (WARNING_ALL_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_ALL} allowed")
+            set(ACTIVATE_WARNING_ALL "ON" CACHE BOOL "activate -Wall flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_ALL} not allowed")
+        endif (WARNING_ALL_ALLOWED)
+
+        set(WARNING_EXTRA "-Wextra")
+        CHECK_C_COMPILER_FLAG(${WARNING_EXTRA} WARNING_EXTRA_ALLOWED)
+        if (WARNING_EXTRA_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_EXTRA} allowed")
+            set(ACTIVATE_WARNING_EXTRA "ON" CACHE BOOL "activate -Wextra flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_EXTRA} not allowed")
+        endif (WARNING_EXTRA_ALLOWED)
+
+        set(WARNING_FLOAT_EQUAL "-Wfloat-equal")
+        CHECK_C_COMPILER_FLAG(${WARNING_FLOAT_EQUAL} WARNING_FLOAT_EQUAL_ALLOWED)
+        if (WARNING_FLOAT_EQUAL_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_FLOAT_EQUAL} allowed")
+            set(ACTIVATE_WARNING_FLOAT_EQUAL "OFF" CACHE BOOL "activate -Wfloat-equal flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_FLOAT_EQUAL} not allowed")
+        endif (WARNING_FLOAT_EQUAL_ALLOWED)
+
+        set(WARNING_SIGN_CONVERSION "-Wsign-conversion")
+        CHECK_C_COMPILER_FLAG(${WARNING_SIGN_CONVERSION} WARNING_SIGN_CONVERSION_ALLOWED)
+        if (WARNING_SIGN_CONVERSION_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_SIGN_CONVERSION} allowed")
+            set(ACTIVATE_WARNING_SIGN_CONVERSION "OFF" CACHE BOOL "activate -Wsign-conversion flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_SIGN_CONVERSION} not allowed")
+        endif (WARNING_SIGN_CONVERSION_ALLOWED)
+
+        if (ACTIVATE_POSITION_INDEPENDENT_CODE_FLAG)
+            list(APPEND CMAKE_C_FLAGS ${POSITION_INDEPENDENT_CODE_FLAG})
+        else ()
+            string(REPLACE ${POSITION_INDEPENDENT_CODE_FLAG} "" CMAKE_C_FLAGS "${POSITION_INDEPENDENT_CODE_FLAG}")
+        endif (ACTIVATE_POSITION_INDEPENDENT_CODE_FLAG)
+
+        if (ACTIVATE_WARNING_UNDEF)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_UNDEF})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_UNDEF})
+        else ()
+            string(REPLACE ${WARNING_UNDEF} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_UNDEF} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_UNDEF)
+
+        if (ACTIVATE_WARNING_SHADOW)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_SHADOW})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_SHADOW})
+        else ()
+            string(REPLACE ${WARNING_SHADOW} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_SHADOW} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_SHADOW)
+
+        if (ACTIVATE_WARNING_CAST_QUAL)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_CAST_QUAL})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_CAST_QUAL})
+        else ()
+            string(REPLACE ${WARNING_CAST_QUAL} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_CAST_QUAL} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_CAST_QUAL)
+
+        if (ACTIVATE_WARNING_CAST_ALIGN)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_CAST_ALIGN})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_CAST_ALIGN})
+        else ()
+            string(REPLACE ${WARNING_CAST_ALIGN} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_CAST_ALIGN} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_CAST_ALIGN)
+
+        if (ACTIVATE_WARNING_STRICT_PROTOTYPES)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_STRICT_PROTOTYPES})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_STRICT_PROTOTYPES})
+        else ()
+            string(REPLACE ${WARNING_STRICT_PROTOTYPES} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_STRICT_PROTOTYPES} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_STRICT_PROTOTYPES)
+
+        if (ACTIVATE_WARNING_ALL)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_ALL})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_ALL})
+        else ()
+            string(REPLACE ${WARNING_ALL} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_ALL} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_ALL)
+
+        if (ACTIVATE_WARNING_EXTRA)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_EXTRA})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_EXTRA})
+        else ()
+            string(REPLACE ${WARNING_EXTRA} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_EXTRA} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_EXTRA)
+
+        if (ACTIVATE_WARNING_FLOAT_EQUAL)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_FLOAT_EQUAL})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_FLOAT_EQUAL})
+        else ()
+            string(REPLACE ${WARNING_FLOAT_EQUAL} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_FLOAT_EQUAL} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_FLOAT_EQUAL)
+
+        if (ACTIVATE_WARNING_SIGN_CONVERSION)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_SIGN_CONVERSION})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_SIGN_CONVERSION})
+        else ()
+            string(REPLACE ${WARNING_SIGN_CONVERSION} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_SIGN_CONVERSION} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_WARNING_SIGN_CONVERSION)
+
+        #Set c++11 by default
+        list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
+
+        #Set c99 by default
+        list(APPEND CMAKE_C_FLAGS "-std=c99")
+
+    elseif (MSVC)
+        # Add specific compilation flags for Windows Visual
+
+        set(WARNING_ALL "/Wall")
+        CHECK_C_COMPILER_FLAG(${WARNING_ALL} WARNING_ALL_ALLOWED)
+        if (WARNING_ALL_ALLOWED)
+            MESSAGE("Compiler flag ${WARNING_ALL} allowed")
+            set(ACTIVATE_WARNING_ALL "OFF" CACHE BOOL "activate /Wall flag")
+        else ()
+            MESSAGE("Compiler flag ${WARNING_ALL} not allowed")
+        endif (WARNING_ALL_ALLOWED)
+
+        if (ACTIVATE_WARNING_ALL)
+            list(APPEND CMAKE_CXX_FLAGS ${WARNING_ALL})
+            list(APPEND CMAKE_C_FLAGS ${WARNING_ALL})
+        else ()
+            string(REPLACE ${WARNING_ALL} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${WARNING_ALL} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif ()
+        if (MSVC80 OR MSVC90 OR MSVC10 OR MSVC11)
+            # To avoid compiler warning (level 4) C4571, compile with /EHa if you still want
+            # your catch(...) blocks to catch structured exceptions.
+            list(APPEND CMAKE_CXX_FLAGS "/EHa")
+        endif (MSVC80 OR MSVC90 OR MSVC10 OR MSVC11)
+
+        set(MULTITHREADED_COMPILATION "/MP")
+        MESSAGE("Compiler flag ${MULTITHREADED_COMPILATION} allowed")
+        set(ACTIVATE_MULTITHREADED_COMPILATION "ON" CACHE BOOL "activate /MP flag")
+
+        if (ACTIVATE_MULTITHREADED_COMPILATION)
+            list(APPEND CMAKE_CXX_FLAGS ${MULTITHREADED_COMPILATION})
+            list(APPEND CMAKE_C_FLAGS ${MULTITHREADED_COMPILATION})
+        else ()
+            string(REPLACE ${MULTITHREADED_COMPILATION} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+            string(REPLACE ${MULTITHREADED_COMPILATION} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+        endif (ACTIVATE_MULTITHREADED_COMPILATION)
+
+        #For exceptions
+        list(APPEND CMAKE_CXX_FLAGS "/EHsc")
+    endif ()
+
+    # Remove duplicates compilation flags
+    separate_arguments(CMAKE_CXX_FLAGS)
+    list(REMOVE_DUPLICATES CMAKE_CXX_FLAGS)
+    string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING "common C++ build flags" FORCE)
+
+    separate_arguments(CMAKE_C_FLAGS)
+    list(REMOVE_DUPLICATES CMAKE_C_FLAGS)
+    string(REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "common C build flags" FORCE)
+
+    if (MSVC)
+        # Replace /MT to /MD flag
+        FOREACH (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+                CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+            STRING(REGEX REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}")
+        ENDFOREACH (flag_var)
+
+        FOREACH (flag_var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+                CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
+            STRING(REGEX REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}")
+        ENDFOREACH (flag_var)
+    endif ()
+
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CACHE STRING "Updated flags" FORCE)
+
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}" CACHE STRING "Updated flags" FORCE)
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}" CACHE STRING "Updated flags" FORCE)
+
+ENDMACRO(ADD_EXTRA_COMPILATION_FLAGS)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 000000000..206471c27
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,116 @@
+# ################################################################
+# zstd - Makefile
+# Copyright (C) Yann Collet 2014-2015
+# All rights reserved.
+# 
+# BSD license
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# 
+# * Redistributions in binary form must reproduce the above copyright notice, this
+#   list of conditions and the following disclaimer in the documentation and/or
+#   other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# You can contact the author at :
+#  - zstd source repository : https://github.com/Cyan4973/zstd
+#  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+# ################################################################
+
+function(ExtractVersion _content _outputVar1 _outputVar2 _outputVar3)
+    string(REGEX MATCHALL ".*define ZSTD_VERSION_MAJOR+.* ([0-9]+).*define ZSTD_VERSION_MINOR+.* ([0-9]+).*define ZSTD_VERSION_RELEASE+.* ([0-9]+)" VERSION_REGEX "${_content}")
+    SET(${_outputVar1} ${CMAKE_MATCH_1} PARENT_SCOPE)
+    SET(${_outputVar2} ${CMAKE_MATCH_2} PARENT_SCOPE)
+    SET(${_outputVar3} ${CMAKE_MATCH_3} PARENT_SCOPE)
+endfunction()
+
+project(libzstd)
+cmake_minimum_required(VERSION 2.8.12)
+
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
+file(READ zstd.h HEADER_CONTENT)
+
+ExtractVersion("${HEADER_CONTENT}" LIBVER_MAJOR LIBVER_MINOR LIBVER_RELEASE)
+message("ZSTD VERSION ${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE}")
+
+SET(Sources
+        fse.c
+        huff0.c
+        zstd_buffered.c
+        zstd_compress.c
+        zstd_decompress.c)
+
+SET(Headers
+        bitstream.h
+        error.h
+        fse.h
+        fse_static.h
+        huff0.h
+        huff0_static.h
+        mem.h
+        zstd_buffered_static.h
+        zstd_buffered.h
+        zstd_internal.h
+        zstd_static.h
+        zstd.h)
+
+IF (ZSTD_LEGACY_SUPPORT)
+    include_directories(legacy)
+
+    SET(Sources ${Sources}
+            legacy/zstd_v01.c
+            legacy/zstd_v02.c
+            legacy/zstd_v03.c)
+
+    SET(Headers ${Headers}
+            legacy/zstd_legacy.h
+            legacy/zstd_v01.h
+            legacy/zstd_v02.h
+            legacy/zstd_v03.h)
+ENDIF (ZSTD_LEGACY_SUPPORT)
+
+IF (MSVC)
+    SET(PlatformDependResources msvc/resource.h msvc/zstdlib.rc)
+ENDIF (MSVC)
+
+add_library(libzstd_static STATIC ${Sources} ${Headers} ${PlatformDependResources})
+add_library(libzstd_shared SHARED ${Sources} ${Headers} ${PlatformDependResources})
+
+IF (MSVC)
+    set_target_properties(libzstd_static PROPERTIES COMPILE_DEFINITIONS "ZSTD_HEAPMODE=0;_CRT_SECURE_NO_WARNINGS")
+    set_target_properties(libzstd_shared PROPERTIES COMPILE_DEFINITIONS "ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;_CRT_SECURE_NO_WARNINGS")
+    set_target_properties(libzstd_shared PROPERTIES COMPILE_DEFINITIONS "-DBUILD_SHARED_LIBS=TRUE")
+ENDIF (MSVC)
+
+target_include_directories(libzstd_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(libzstd_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+IF (ZSTD_LEGACY_SUPPORT)
+    target_include_directories(libzstd_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/legacy)
+    target_include_directories(libzstd_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/legacy)
+ENDIF (ZSTD_LEGACY_SUPPORT)
+
+SET_TARGET_PROPERTIES(
+        libzstd_shared
+        PROPERTIES
+        OUTPUT_NAME libzstd_shared.${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE})
+
+SET_TARGET_PROPERTIES(
+        libzstd_static
+        PROPERTIES
+        OUTPUT_NAME libzstd_static.${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE})
\ No newline at end of file
diff --git a/lib/msvc/resource.h b/lib/msvc/resource.h
new file mode 100644
index 000000000..db984ef4d
Binary files /dev/null and b/lib/msvc/resource.h differ
diff --git a/lib/msvc/zstdlib.rc b/lib/msvc/zstdlib.rc
new file mode 100644
index 000000000..93e221d9f
Binary files /dev/null and b/lib/msvc/zstdlib.rc differ
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
new file mode 100644
index 000000000..c88345365
--- /dev/null
+++ b/programs/CMakeLists.txt
@@ -0,0 +1,69 @@
+# ################################################################
+# zstd - Makefile
+# Copyright (C) Yann Collet 2014-2015
+# All rights reserved.
+#
+# BSD license
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice, this
+#   list of conditions and the following disclaimer in the documentation and/or
+#   other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# You can contact the author at :
+#  - zstd source repository : https://github.com/Cyan4973/zstd
+#  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+# ################################################################
+
+project(programs)
+cmake_minimum_required(VERSION 2.8.12)
+
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
+IF (ZSTD_LEGACY_SUPPORT)
+    include_directories(legacy)
+    SET(ZSTD_FILEIO_LEGACY legacy/fileio_legacy.c)
+ENDIF (ZSTD_LEGACY_SUPPORT)
+
+SET(Sources_zstd zstdcli.c fileio.c ${ZSTD_FILEIO_LEGACY} bench.c xxhash.c datagen.c)
+
+add_executable(zstd ${Sources_zstd})
+target_link_libraries(zstd libzstd_static)
+
+add_executable(zstd-noBench zstdcli.c fileio.c ${ZSTD_FILEIO_LEGACY})
+target_link_libraries(zstd-noBench libzstd_static)
+set_target_properties(zstd-noBench PROPERTIES COMPILE_DEFINITIONS "ZSTD_NOBENCH")
+
+add_executable(fullbench datagen.c fullbench.c)
+target_link_libraries(fullbench libzstd_static)
+
+add_executable(fuzzer datagen.c xxhash.c fuzzer.c)
+target_link_libraries(fuzzer libzstd_static)
+
+add_executable(zbufftest datagen.c xxhash.c zbufftest.c)
+target_link_libraries(zbufftest libzstd_static)
+
+add_executable(paramgrill datagen.c xxhash.c paramgrill.c)
+target_link_libraries(paramgrill libzstd_static)
+IF (NOT MSVC)
+    set_target_properties(paramgrill PROPERTIES LINK_FLAGS "-lm")
+ENDIF (NOT MSVC)
+
+add_executable(datagen datagen.c datagencli.c)
+target_link_libraries(datagen libzstd_static)