mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 02:37:55 +08:00
ad69a7fc8e
* [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
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
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)
|