mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 02:49:01 +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
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
|
|
index ab491c6..bee3d1f 100644
|
|
--- a/applications/CMakeLists.txt
|
|
+++ b/applications/CMakeLists.txt
|
|
@@ -32,12 +32,16 @@ IF(DYNAMIC_OPENSCENEGRAPH)
|
|
ADD_SUBDIRECTORY(osgconv)
|
|
ADD_SUBDIRECTORY(osgfilecache)
|
|
ADD_SUBDIRECTORY(osgversion)
|
|
- ADD_SUBDIRECTORY(present3D)
|
|
+ if (NOT UNIX)
|
|
+ ADD_SUBDIRECTORY(present3D)
|
|
+ endif()
|
|
ELSE()
|
|
# need to define this on win32 or linker cries about _declspecs
|
|
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
|
|
|
|
ADD_SUBDIRECTORY(osgversion)
|
|
- ADD_SUBDIRECTORY(present3D)
|
|
+ if (NOT UNIX)
|
|
+ ADD_SUBDIRECTORY(present3D)
|
|
+ endif()
|
|
ENDIF()
|
|
|
|
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
|
|
index 788e507..3c550bc 100644
|
|
--- a/examples/CMakeLists.txt
|
|
+++ b/examples/CMakeLists.txt
|
|
@@ -245,7 +245,7 @@ ELSE(DYNAMIC_OPENSCENEGRAPH)
|
|
|
|
IF(OSG_BUILD_PLATFORM_IPHONE)
|
|
ADD_SUBDIRECTORY(osgviewerIPhone)
|
|
- ELSE()
|
|
+ ELSEIF (NOT UNIX)
|
|
ADD_SUBDIRECTORY(osgstaticviewer)
|
|
ENDIF()
|
|
|