From caf56902c3f1771a28fa9d210019e071c1ffa731 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 9 Sep 2013 12:33:20 +0000 Subject: [PATCH] From Laurens Voerman, "two minor fixes, both in a CMakeList.txt file, 1> osgmultiplemovies example does not use SDL so needs no link to SDL 2> Added header files to "Plugins osg" project, so visual studio can find the source of OSG_WARN << "AsciiInputIterator::readProperty(): Unmatched property " " --- examples/osgmultiplemovies/CMakeLists.txt | 11 ----------- src/osgPlugins/osg/CMakeLists.txt | 6 +++++- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/examples/osgmultiplemovies/CMakeLists.txt b/examples/osgmultiplemovies/CMakeLists.txt index f1b00005b..3c79f9126 100644 --- a/examples/osgmultiplemovies/CMakeLists.txt +++ b/examples/osgmultiplemovies/CMakeLists.txt @@ -1,14 +1,3 @@ -# INCLUDE_DIRECTORIES( ${OPENAL_INCLUDE_DIR} ) -# SET(TARGET_EXTERNAL_LIBRARIES ${OPENAL_LIBRARY} alut) - -IF (SDL_FOUND) - SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ) - INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ) - ADD_DEFINITIONS(-DUSE_SDL) - IF (MINGW) - SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} winmm dinput ddraw dxguid) - ENDIF() -ENDIF(SDL_FOUND) SET(TARGET_SRC osgmultiplemovies.cpp ) SET(TARGET_ADDED_LIBRARIES osgGA ) diff --git a/src/osgPlugins/osg/CMakeLists.txt b/src/osgPlugins/osg/CMakeLists.txt index 02d7e9c85..180422d03 100644 --- a/src/osgPlugins/osg/CMakeLists.txt +++ b/src/osgPlugins/osg/CMakeLists.txt @@ -2,6 +2,10 @@ SET(TARGET_SRC ReaderWriterOSG.cpp ReaderWriterOSG2.cpp ) - +SET(TARGET_H + AsciiStreamOperator.h + BinaryStreamOperator.h + XmlStreamOperator.h +) #### end var setup ### SETUP_PLUGIN(osg)