Merge branch 'master' of https://github.com/EMCECS/vcpkg

# Conflicts:
#	ports/ecsutil/CONTROL
#	ports/ecsutil/portfile.cmake

3 files changed, 7 insertions, 40 deletions

diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
index fada181ac..4bcfb031b 100644
--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@@ -1,4 +1,4 @@
 Source: ecsutil

-Version: 1.0.1.2-1

+Version: 1.0.1.3

 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.

 Build-Depends: atlmfc

diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch
deleted file mode 100644
index 2899a0108..000000000
--- a/ports/ecsutil/disable-setversion.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj

-index 05c5726..f8ac64e 100644

---- a/ECSUtil/ECSUtil.vcxproj

-+++ b/ECSUtil/ECSUtil.vcxproj

-@@ -274,7 +274,6 @@

-       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-     </ResourceCompile>

-     <PostBuildEvent>

--      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

-     </PostBuildEvent>

-     <PostBuildEvent>

-       <Message>set version resource in DLL from source file</Message>

-@@ -361,7 +360,6 @@

-       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-     </ResourceCompile>

-     <PostBuildEvent>

--      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

-     </PostBuildEvent>

-     <PostBuildEvent>

-       <Message>set version resource in DLL from source file</Message>

-@@ -445,7 +443,6 @@

-       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-     </ResourceCompile>

-     <PostBuildEvent>

--      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

-     </PostBuildEvent>

-     <PostBuildEvent>

-       <Message>set version resource in DLL from source file</Message>

-@@ -541,7 +538,6 @@

-       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-     </ResourceCompile>

-     <PostBuildEvent>

--      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

-     </PostBuildEvent>

-     <PostBuildEvent>

-       <Message>set version resource in DLL from source file</Message>

diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake
index 4a8e48b2b..ff8d8a6b1 100644
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@@ -28,10 +28,9 @@ endif()
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO EMCECS/ecs-object-client-windows-cpp

-    REF v1.0.1.2

-    SHA512 ee6c9086111f9cb4a3b9b0645a6a8921bae1d3e8fba0d054d824935b0ff82a57db5c1476183202694afe33f89bfc47db1ef91696a739a1a43a1e2411e4361e6f

+    REF v1.0.1.3

+    SHA512 0c79e522c687aa942e018f5bab619522523b3efee6e421439bda2a93dfa8e2c2665e136a6aae9cba2f8637c296822b91127cd06053c2a39be4e3324cd1792dda

     HEAD_REF master

-    PATCHES disable-setversion.patch

 )

 

 vcpkg_install_msbuild(

@@ -44,6 +43,10 @@ vcpkg_install_msbuild(
     DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG}

 )

 

+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

+endif()

+

 file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools)

 file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll)