aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-01-23 07:22:30 -0800
committerGitHub <noreply@github.com>2018-01-23 07:22:30 -0800
commit65ee81b1a25d5c9b0d666bdc651d903628118a25 (patch)
treea076b2e1d639079a66c5a22e2ecfe2103ff7d4d8
parent88815a84b7dc7157e6d7c70cd4ff5f2d7375a065 (diff)
parentb17566a694a0b49a2abce58dc90b32e791081f85 (diff)
downloadvcpkg-65ee81b1a25d5c9b0d666bdc651d903628118a25.tar.gz
vcpkg-65ee81b1a25d5c9b0d666bdc651d903628118a25.zip
Merge pull request #2616 from calumr/osg-debug-plugins
[osg] Keep debug plugins separate
-rw-r--r--ports/osg/CONTROL2
-rw-r--r--ports/osg/portfile.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL
index df2af4bc1..4e3a308a4 100644
--- a/ports/osg/CONTROL
+++ b/ports/osg/CONTROL
@@ -1,4 +1,4 @@
Source: osg
-Version: 3.5.6-1
+Version: 3.5.6-2
Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit.
Build-Depends: freetype, jasper, openexr, zlib, gdal, giflib, libjpeg-turbo, libpng, tiff
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
index 5d68a57be..ac6f8e2ee 100644
--- a/ports/osg/portfile.cmake
+++ b/ports/osg/portfile.cmake
@@ -47,7 +47,7 @@ file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
file(REMOVE_RECURSE ${OSG_TOOLS_DBG})
file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.5.6/*.dll)
-file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.5.6)
+file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.5.6)
file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.5.6/*.dll)
file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.5.6)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.5.6/)