diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-02-14 09:53:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 17:53:23 -0800 |
| commit | ad69a7fc8ee9324b95105cbfd89f2a615ad570af (patch) | |
| tree | c0fdba243bc4b23065c16e7e960a2c8f0c6ea6aa /ports/osg/fix-example-application.patch | |
| parent | 375ea0ec6b9df9a82704f01c3afc1bf3d00b618b (diff) | |
| download | vcpkg-ad69a7fc8ee9324b95105cbfd89f2a615ad570af.tar.gz vcpkg-ad69a7fc8ee9324b95105cbfd89f2a615ad570af.zip | |
[osg]Fix windows-dynamic/linux build. (#8060)
* [osg]Fix dynamic build.
* [sdl1]Fix linux command.
* [osg]Fix linux build: disable present3D and osgstaticview.
* [osg]fix windows build-only for windows.
* [osg]Fix file INSTALL error.
* [osg]Add dependency conditions.
* [osg]disable OSG_USE_UTF8_FILENAME in Linux and OSX.
* [osg]Fix find dependency curl. Replace version num by macro.
* [osg]Add option CMAKE_CXX_STANDARD
* [osg] Remove library prefix.
* [osg] Fix install pdbs
* [osg] Remove usless plugin libs.
* update baseline
* update baseline
* update baseline
* update baseline
Diffstat (limited to 'ports/osg/fix-example-application.patch')
| -rw-r--r-- | ports/osg/fix-example-application.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch new file mode 100644 index 000000000..4745f8b41 --- /dev/null +++ b/ports/osg/fix-example-application.patch @@ -0,0 +1,34 @@ +diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt +index df859d0..123313a 100644 +--- a/applications/present3D/CMakeLists.txt ++++ b/applications/present3D/CMakeLists.txt +@@ -103,6 +103,11 @@ ENDIF() + IF (WIN32) + # to support cluster code + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) ++ ++ find_package(EXPAT REQUIRED) ++ find_package(unofficial-iconv CONFIG REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset) + ELSE() + CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) + IF(LIB_NSL_HAS_GETHOSTBYNAME) +diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt +index 071ab26..bf8d85f 100644 +--- a/examples/osgstaticviewer/CMakeLists.txt ++++ b/examples/osgstaticviewer/CMakeLists.txt +@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) + SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) + ENDIF(FREETYPE_FOUND) + ++IF (WIN32) ++ find_package(EXPAT REQUIRED) ++ find_package(unofficial-iconv CONFIG REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset) ++ENDIF() ++ + SET(TARGET_SRC osgstaticviewer.cpp ) + #### end var setup ### + SETUP_EXAMPLE(osgstaticviewer) |