sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-12-08 00:03:24 -05:00
Code Issues Projects Releases Wiki Activity

fixed CMake compilation with Visual Studio

Browse Source
This commit is contained in:
Przemyslaw Skibinski 2016-12-19 09:28:55 +01:00
parent 5477dd7ac9
commit 08e8d30d1b
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appveyor.yml
View File

@ -55,6 +55,13 @@ build_script:
make -C contrib\pzstd tests && make -C contrib\pzstd tests &&
make -C contrib\pzstd check && make -C contrib\pzstd check &&
make -C contrib\pzstd clean make -C contrib\pzstd clean
ECHO *** &&
ECHO *** Building cmake for %PLATFORM% &&
ECHO *** &&
mkdir build\cmake\build &&
cd build\cmake\build &&
cmake -G "Visual Studio 14 2015 Win64" .. &&
cd ..\..\..
) )
- if [%COMPILER%]==[gcc] ( - if [%COMPILER%]==[gcc] (
ECHO *** && ECHO *** &&

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

@ -110,8 +110,8 @@ IF (ZSTD_LEGACY_SUPPORT)
ENDIF (ZSTD_LEGACY_SUPPORT) ENDIF (ZSTD_LEGACY_SUPPORT)
IF (MSVC) IF (MSVC)
SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/zstdlib) SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/libzstd-dll)
SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/zstdlib.rc) SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/libzstd-dll.rc)
ENDIF (MSVC) ENDIF (MSVC)
# Split project to static and shared libraries build # Split project to static and shared libraries build

7
build/cmake/programs/CMakeLists.txt
View File

@ -47,7 +47,12 @@ IF (ZSTD_LEGACY_SUPPORT)
INCLUDE_DIRECTORIES(${PROGRAMS_LEGACY_DIR} ${LIBRARY_DIR}/legacy) INCLUDE_DIRECTORIES(${PROGRAMS_LEGACY_DIR} ${LIBRARY_DIR}/legacy)
ENDIF (ZSTD_LEGACY_SUPPORT) ENDIF (ZSTD_LEGACY_SUPPORT)
ADD_EXECUTABLE(zstd ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/bench.c ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/dibio.c) IF (MSVC)
SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/zstd)
SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/zstd.rc)
ENDIF (MSVC)
ADD_EXECUTABLE(zstd ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/bench.c ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/dibio.c ${PlatformDependResources})
TARGET_LINK_LIBRARIES(zstd libzstd_static) TARGET_LINK_LIBRARIES(zstd libzstd_static)
IF (UNIX) IF (UNIX)