My working unpac space for OCaml projects in development
Merge pull request #4504 from rzikm/asm-conditional
Make ASM language conditional at CMake configure time
authored by
Yann Collet
and committed by
GitHub
7dd8bb53
08af53f4
+3
-2
+1
-1
vendor/git/zstd-c/build/cmake/CMakeLists.txt
+1
-1
vendor/git/zstd-c/build/cmake/CMakeLists.txt
···
29
29
#-----------------------------------------------------------------------------
30
30
project(zstd
31
31
VERSION "${ZSTD_FULL_VERSION}"
32
-
LANGUAGES C ASM # Main library is in C and ASM
32
+
LANGUAGES C # Main library is in C and ASM, ASM is enabled conditionally
33
33
HOMEPAGE_URL "${zstd_HOMEPAGE_URL}"
34
34
DESCRIPTION "${zstd_DESCRIPTION}"
35
35
)
+2
-1
vendor/git/zstd-c/build/cmake/lib/CMakeLists.txt
+2
-1
vendor/git/zstd-c/build/cmake/lib/CMakeLists.txt
···
7
7
# in the COPYING file in the root directory of this source tree).
8
8
# ################################################################
9
9
10
-
project(libzstd C ASM)
10
+
project(libzstd C) # ASM language is conditionally enabled where supported
11
11
12
12
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
13
13
option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
···
40
40
add_compile_options(-DZSTD_DISABLE_ASM)
41
41
else ()
42
42
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*" AND ${ZSTD_HAS_NOEXECSTACK})
43
+
enable_language(ASM)
43
44
set(DecompressSources ${DecompressSources} ${LIBRARY_DIR}/decompress/huf_decompress_amd64.S)
44
45
else()
45
46
add_compile_options(-DZSTD_DISABLE_ASM)