From 95ff9a1ed77e31c2a9c76611245a5691d6879358 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Sun, 18 Dec 2016 18:17:25 +0200 Subject: [PATCH 1/2] cmake msvc: correct resources --- build/cmake/lib/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index 65942b412..b8510f7be 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt @@ -110,8 +110,8 @@ IF (ZSTD_LEGACY_SUPPORT) ENDIF (ZSTD_LEGACY_SUPPORT) IF (MSVC) - SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/zstdlib) - SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/zstdlib.rc) + SET(MSVC_RESOURCE_DIR ${ROOT_DIR}/build/VS2010/libzstd-dll) + SET(PlatformDependResources ${MSVC_RESOURCE_DIR}/libzstd-dll.rc) ENDIF (MSVC) # Split project to static and shared libraries build From 85a150eab7fe505b53438f8df04c577eda7a4022 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Mon, 19 Dec 2016 14:15:47 +0200 Subject: [PATCH 2/2] cmake msvc: resources are not required for the static library --- build/cmake/lib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index b8510f7be..41fe2733f 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt @@ -115,7 +115,7 @@ IF (MSVC) ENDIF (MSVC) # Split project to static and shared libraries build -ADD_LIBRARY(libzstd_static STATIC ${Sources} ${Headers} ${PlatformDependResources}) +ADD_LIBRARY(libzstd_static STATIC ${Sources} ${Headers}) ADD_LIBRARY(libzstd_shared SHARED ${Sources} ${Headers} ${PlatformDependResources}) # Add specific compile definitions for MSVC project