Update CMakeLists.txt

diff --git a/.gitignore b/.gitignore
index 5521cc65bb670fda336da9b610ce815cec9d9222..7d5ee718a8c8170f646eacf5924dd9cb1aa68ae3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,8 @@
 *.res
 foo.gz
 *.manifest
+
+CMakeCache.txt
+CMakeFiles
+Testing
+*.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c0247cc516b4493bb9a9b66f743a6110139a2b5..8ae9b3f6ffd082259555f2e6deaaea3a2cdc2578 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,9 +5,6 @@ project(zlib C)
 
 set(VERSION "1.2.8")
 
-option(ASM686 "Enable building i686 assembly implementation")
-option(AMD64 "Enable building amd64 assembly implementation")
-
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
 set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
@@ -118,6 +115,7 @@ set(ZLIB_SRCS
     infback.c
     inftrees.c
     inffast.c
+    match.c
     trees.c
     uncompr.c
     zutil.c
@@ -129,39 +127,6 @@ if(NOT MINGW)
     )
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC)
-    if(ASM686)
-        set(ZLIB_ASMS contrib/asm686/match.S)
-    elseif (AMD64)
-        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
-    endif ()
-
-       if(ZLIB_ASMS)
-               add_definitions(-DASMV)
-               set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-       endif()
-endif()
-
-if(MSVC)
-    if(ASM686)
-               ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-                       contrib/masmx86/inffas32.asm
-                       contrib/masmx86/match686.asm
-               )
-    elseif (AMD64)
-               ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-                       contrib/masmx64/gvmat64.asm
-                       contrib/masmx64/inffasx64.asm
-               )
-    endif()
-
-       if(ZLIB_ASMS)
-               add_definitions(-DASMV -DASMINF)
-       endif()
-endif()
-
 # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
 string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"