lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-11-03 20:33:11 +03:00
Code Activity

Merge pull request #4504 from rzikm/asm-conditional

Browse Source 
Make ASM language conditional at CMake configure time
This commit is contained in:
Yann Collet
2025-10-06 23:39:28 -07:00
committed by GitHub
parent b8d6101fba f94a01de74
commit 23dae4bf49
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/CMakeLists.txt
View File

@@ -29,7 +29,7 @@ include(ZstdVersion)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
project(zstd project(zstd
VERSION "${ZSTD_FULL_VERSION}" VERSION "${ZSTD_FULL_VERSION}"
LANGUAGES C ASM # Main library is in C and ASM LANGUAGES C # Main library is in C and ASM, ASM is enabled conditionally
HOMEPAGE_URL "${zstd_HOMEPAGE_URL}" HOMEPAGE_URL "${zstd_HOMEPAGE_URL}"
DESCRIPTION "${zstd_DESCRIPTION}" DESCRIPTION "${zstd_DESCRIPTION}"
) )

3
build/cmake/lib/CMakeLists.txt
View File

@@ -7,7 +7,7 @@
# in the COPYING file in the root directory of this source tree). # in the COPYING file in the root directory of this source tree).
# ################################################################ # ################################################################
project(libzstd C ASM) project(libzstd C) # ASM language is conditionally enabled where supported
set(CMAKE_INCLUDE_CURRENT_DIR TRUE) set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON) option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
@@ -40,6 +40,7 @@ if (MSVC)
add_compile_options(-DZSTD_DISABLE_ASM) add_compile_options(-DZSTD_DISABLE_ASM)
else () else ()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*" AND ${ZSTD_HAS_NOEXECSTACK}) if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*" AND ${ZSTD_HAS_NOEXECSTACK})
enable_language(ASM)
set(DecompressSources ${DecompressSources} ${LIBRARY_DIR}/decompress/huf_decompress_amd64.S) set(DecompressSources ${DecompressSources} ${LIBRARY_DIR}/decompress/huf_decompress_amd64.S)
else() else()
add_compile_options(-DZSTD_DISABLE_ASM) add_compile_options(-DZSTD_DISABLE_ASM)