diff options
| author | Alberto Luaces <aluaces@udc.es> | 2020-08-12 19:22:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 10:22:40 -0700 |
| commit | d7fc2196c139b06e797afa3d6673c7bb9a278593 (patch) | |
| tree | 64ad0e331d975084a69b09588b5650b4ad722529 | |
| parent | 9a751370f3bb773568178eef0fbc1994b6aad453 (diff) | |
| download | vcpkg-d7fc2196c139b06e797afa3d6673c7bb9a278593.tar.gz vcpkg-d7fc2196c139b06e797afa3d6673c7bb9a278593.zip | |
[osg] Update to 3.6.5 (#12672)
* Update osg to 3.6.5.
* Remove port-version
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
| -rw-r--r-- | ports/osg/CONTROL | 4 | ||||
| -rw-r--r-- | ports/osg/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/osg/remove-prefix.patch | 9 |
3 files changed, 4 insertions, 13 deletions
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 598ec59b1..6a7d856da 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,5 +1,5 @@ Source: osg -Version: 3.6.4-3 +Version: 3.6.5 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx) @@ -24,4 +24,4 @@ Feature: packages Description: Set to ON to generate CPack configuration files and packaging targets Feature: docs -Description: Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads
\ No newline at end of file +Description: Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index d8c8a8465..332359122 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -1,10 +1,10 @@ -set(OSG_VER 3.6.4) +set(OSG_VER 3.6.5) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openscenegraph/OpenSceneGraph REF OpenSceneGraph-${OSG_VER} - SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19 + SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b HEAD_REF master PATCHES collada.patch diff --git a/ports/osg/remove-prefix.patch b/ports/osg/remove-prefix.patch index 62b1466c9..ced94522c 100644 --- a/ports/osg/remove-prefix.patch +++ b/ports/osg/remove-prefix.patch @@ -11,15 +11,6 @@ index bb3be63..356edcd 100644 HANDLE_MSVC_DLL() ENDIF() -@@ -33,7 +33,7 @@ INSTALL( - ) - - IF(MSVC AND DYNAMIC_OPENSCENEGRAPH) -- GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX) -+ set(PREFIX "") - INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS RelWithDebInfo) - INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Debug) - ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH) diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt index 84550bd..0e816f7 100644 --- a/src/OpenThreads/win32/CMakeLists.txt |