Skip to content
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

Jump to bottom

[osg] build failure #15044

Merged
merged 5 commits into from
Dec 15, 2020
Merged

[osg] build failure #15044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61cc320
[osg] build failure
JonLiu1993 Dec 10, 2020
37739da
Merge patchfile
JonLiu1993 Dec 11, 2020
1d8e0ce
Modify the patch file format
JonLiu1993 Dec 11, 2020
2723fd7
Modify the patch
JonLiu1993 Dec 14, 2020
bd2f733
Update fix-example-application.patch
NancyLi1013 Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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,6 +1,6 @@
Source: osg
Version: 3.6.5
Port-Version: 4
Port-Version: 5
Homepage: https://github.com/openscenegraph/OpenSceneGraph
Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit.
Build-Depends: zlib, fontconfig, freeglut (windows), expat (windows), openimageio (osx)
Expand Down
4 changes: 2 additions & 2 deletions ports/osg/fix-example-application.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ index df859d0..123313a 100644
SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32)
+
+ find_package(EXPAT REQUIRED)
+ find_package(Iconv CONFIG REQUIRED)
+ find_package(Iconv REQUIRED)
+
+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv)
ELSE()
Expand All @@ -24,7 +24,7 @@ index 071ab26..bf8d85f 100644

+IF (WIN32)
+ find_package(EXPAT REQUIRED)
+ find_package(Iconv CONFIG REQUIRED)
+ find_package(Iconv REQUIRED)
+
+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv)
+ENDIF()
Expand Down