Skip to content

Commit 2538732

Browse files
committed
Fixed zstd cmake shared build on windows
1 parent 0fcb28c commit 2538732

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

build/cmake/programs/CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,17 @@ if (MSVC)
3232
set(PlatformDependResources ${MSVC_RESOURCE_DIR}/zstd.rc)
3333
endif ()
3434

35-
add_executable(zstd ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c ${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/fileio_asyncio.c ${PROGRAMS_DIR}/benchfn.c ${PROGRAMS_DIR}/benchzstd.c ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/dibio.c ${PROGRAMS_DIR}/zstdcli_trace.c ${PlatformDependResources})
35+
set(ZSTD_PROGRAM_SRCS ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/util.c
36+
${PROGRAMS_DIR}/timefn.c ${PROGRAMS_DIR}/fileio.c
37+
${PROGRAMS_DIR}/fileio_asyncio.c ${PROGRAMS_DIR}/benchfn.c
38+
${PROGRAMS_DIR}/benchzstd.c ${PROGRAMS_DIR}/datagen.c
39+
${PROGRAMS_DIR}/dibio.c ${PROGRAMS_DIR}/zstdcli_trace.c
40+
${PlatformDependResources})
41+
if (MSVC AND ZSTD_PROGRAMS_LINK_SHARED)
42+
list(APPEND ZSTD_PROGRAM_SRCS ${LIBRARY_DIR}/common/pool.c ${LIBRARY_DIR}/common/threading.c)
43+
endif ()
44+
45+
add_executable(zstd ${ZSTD_PROGRAM_SRCS})
3646
target_link_libraries(zstd ${PROGRAMS_ZSTD_LINK_TARGET})
3747
if (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
3848
target_link_libraries(zstd rt)
@@ -75,7 +85,9 @@ if (UNIX)
7585
${CMAKE_CURRENT_BINARY_DIR}/zstdless.1
7686
DESTINATION "${MAN_INSTALL_DIR}")
7787

78-
add_executable(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c ${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/fileio_asyncio.c)
88+
add_executable(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c
89+
${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c
90+
${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/fileio_asyncio.c)
7991
target_link_libraries(zstd-frugal ${PROGRAMS_ZSTD_LINK_TARGET})
8092
set_property(TARGET zstd-frugal APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_NOBENCH;ZSTD_NODICT;ZSTD_NOTRACE")
8193
endif ()

0 commit comments

Comments
 (0)