diff options
| author | Long Huan <8551701+longhuan2018@users.noreply.github.com> | 2019-08-15 05:12:55 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-14 14:12:55 -0700 |
| commit | 37469195efe08d9b2b70326806cbca1773576b4a (patch) | |
| tree | 69910af2b5a30fbd09b18cfbdcd1e25ec5d3a856 | |
| parent | f9c92910a7d0ee328aaeead71c8a5c59a1189a97 (diff) | |
| download | vcpkg-37469195efe08d9b2b70326806cbca1773576b4a.tar.gz vcpkg-37469195efe08d9b2b70326806cbca1773576b4a.zip | |
Fix osgqt build error LNK 1181 (#7672)
| -rw-r--r-- | ports/osg-qt/OsgMacroUtils.patch | 11 | ||||
| -rw-r--r-- | ports/osg-qt/portfile.cmake | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ports/osg-qt/OsgMacroUtils.patch b/ports/osg-qt/OsgMacroUtils.patch new file mode 100644 index 000000000..96f040cd3 --- /dev/null +++ b/ports/osg-qt/OsgMacroUtils.patch @@ -0,0 +1,11 @@ +--- a/CMakeModules/OsgMacroUtils.cmake ++++ b/CMakeModules/OsgMacroUtils.cmake +@@ -88,7 +88,7 @@ MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) + ENDIF() + + LINK_EXTERNAL(${CORELIB_NAME} ${ALL_GL_LIBRARIES}) +- LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY) ++ #LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY) + IF(OPENSCENEGRAPH_SONAMES) + SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION}) + ENDIF(OPENSCENEGRAPH_SONAMES) diff --git a/ports/osg-qt/portfile.cmake b/ports/osg-qt/portfile.cmake index 1ab23e63f..f78dbf37f 100644 --- a/ports/osg-qt/portfile.cmake +++ b/ports/osg-qt/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF Qt4 SHA512 426a4ba88f680978d24817248b99c68cafa4517144e6e3d2480612870c4a224bb955539cacb438274d4ee1c93c36d94f8437d142070b2ecde2b81517bf357e71
HEAD_REF master
+ PATCHES
+ OsgMacroUtils.patch
)
|