Skip to content

[osg] Fix link error caused by static tiff library #6674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Haojia521 wants to merge 8 commits into from
Closed

[osg] Fix link error caused by static tiff library #6674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
925842e
Merge pull request #1 from microsoft/master
Haojia521 May 10, 2019
a355f5a
Merge pull request #2 from microsoft/master
Haojia521 May 16, 2019
8793fc8
Merge pull request #3 from microsoft/master
Haojia521 May 19, 2019
a155c44
Merge pull request #4 from microsoft/master
Haojia521 May 20, 2019
9bea4b8
Merge pull request #5 from microsoft/master
Haojia521 May 22, 2019
fb96a95
Merge pull request #6 from microsoft/master
Haojia521 May 27, 2019
a41a2f3
add a patch to fix osg link error caused by static tiff library
Haojia521 May 29, 2019
d2195ec
update patch
Haojia521 Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/osg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: osg
Version: 3.6.3-1
Version: 3.6.3-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

Expand Down
14 changes: 14 additions & 0 deletions ports/osg/fix-link-error-caused-by-static-tiff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/osgPlugins/tiff/CMakeLists.txt b/src/osgPlugins/tiff/CMakeLists.txt
index fc945d6..d7b7027 100644
--- a/src/osgPlugins/tiff/CMakeLists.txt
+++ b/src/osgPlugins/tiff/CMakeLists.txt
@@ -2,7 +2,8 @@ INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} )

SET(TARGET_SRC ReaderWriterTIFF.cpp )

-SET(TARGET_LIBRARIES_VARS TIFF_LIBRARY)
+# using TIFF_LIBRARIES instead of TIFF_LIBRARY to link dependency libs
+SET(TARGET_LIBRARIES_VARS TIFF_LIBRARIES)

#### end var setup ###
SETUP_PLUGIN(tiff)
1 change: 1 addition & 0 deletions ports/osg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
collada.patch
fix-link-error-caused-by-static-tiff.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand Down