ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #492 from inikep/dev11

Browse Source 
test CMake on Windows
This commit is contained in:
Yann Collet
2016-12-21 11:23:04 +01:00
committed by GitHub
parent 0ffa03d8e3 7ee2bd7840
commit d2ccf180d3
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
appveyor.yml
+7
View File
@@ -46,6 +46,13 @@ build_script:
ECHO make %CLANG_PARAMS% && ECHO make %CLANG_PARAMS% &&
make %CLANG_PARAMS% && make %CLANG_PARAMS% &&
COPY tests\fuzzer.exe tests\fuzzer_clang.exe && COPY tests\fuzzer.exe tests\fuzzer_clang.exe &&
ECHO *** &&
ECHO *** Building cmake for %PLATFORM% &&
ECHO *** &&
mkdir build\cmake\build &&
cd build\cmake\build &&
cmake -G "Visual Studio 14 2015 Win64" .. &&
cd ..\..\.. &&
make clean && make clean &&
ECHO *** && ECHO *** &&
ECHO *** Building pzstd for %PLATFORM% && ECHO *** Building pzstd for %PLATFORM% &&
build/VS2010/libzstd-dll/libzstd-dll.rc
+3 -3
View File
@@ -32,11 +32,11 @@ BEGIN
BEGIN BEGIN
BLOCK "040904B0" BLOCK "040904B0"
BEGIN BEGIN
VALUE "CompanyName", "Yann Collet" VALUE "CompanyName", "Yann Collet, Facebook, Inc."
VALUE "FileDescription", "Fast and efficient compression algorithm" VALUE "FileDescription", "Zstandard - Fast and efficient compression algorithm"
VALUE "FileVersion", ZSTD_VERSION_STRING VALUE "FileVersion", ZSTD_VERSION_STRING
VALUE "InternalName", "libzstd.dll" VALUE "InternalName", "libzstd.dll"
VALUE "LegalCopyright", "Copyright (C) 2013-2016, Yann Collet" VALUE "LegalCopyright", "Copyright (c) 2013-present, Yann Collet, Facebook, Inc."
VALUE "OriginalFilename", "libzstd.dll" VALUE "OriginalFilename", "libzstd.dll"
VALUE "ProductName", "Zstandard" VALUE "ProductName", "Zstandard"
VALUE "ProductVersion", ZSTD_VERSION_STRING VALUE "ProductVersion", ZSTD_VERSION_STRING
build/cmake/programs/CMakeLists.txt
+6 -1
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)