mirror of
https://github.com/facebook/zstd.git
synced 2025-11-03 20:33:11 +03:00
Enable ASM language during CMake configure time only when needed
This commit is contained in:
@@ -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}"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user