NEW: log filter

omega-hub · Apr 9, 2015 · 4f7b042 · 4f7b042
1 parent dd58211
commit 4f7b042
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/external/UseOpenSceneGraph.cmake b/external/UseOpenSceneGraph.cmake
@@ -100,6 +100,7 @@ else()
             -DCOLLADA_INCLUDE_DIR=${COLLADA_INCLUDE_DIR}
             -DCOLLADA_MINIZIP_LIBRARY=${MINIZIP_LIBRARY}
             -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
+            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
             INSTALL_COMMAND ${PLATFORM_INSTALL_COMMAND}
 		)
 endif()

diff --git a/external/UseOsgBullet.cmake b/external/UseOsgBullet.cmake
@@ -45,7 +45,7 @@ set(OSGBULLET_ARGS
 if(WIN32)
         # The OSGWORKS_STATIC preprocessor definition tells osgBullet that
         # we are using the static version of osgWorks.
-        set(OSGBullet_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D\"OSGWORKS_STATIC\"")
+        #set(OSGBullet_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D\"OSGWORKS_STATIC\"")
         set(OSGBULLET_ARGS
                 #-DCMAKE_SHARED_LINKER_FLAGS:STRING="${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcprt.lib /NODEFAULTLIB:libcpmt.lib"
                 #-DCMAKE_LINKER_FLAGS:STRING="${CMAKE_LINKER_FLAGS} /NODEFAULTLIB:libcpmt.lib /NODEFAULTLIB:msvcprt.lib"
@@ -75,7 +75,7 @@ if(WIN32)
                 -DOSG_INCLUDE_DIR:PATH=${OSG_INCLUDES}
                 -DOSG_LIBRARY:PATH=${osg_LIBRARY}
                 -DOSG_LIBRARY_DEBUG:PATH=${osg_LIBRARY_DEBUG}
-		-DOSG_DIR:PATH=${OSG_INSTALL_DIR}
+		        -DOSG_DIR:PATH=${OSG_INSTALL_DIR}
                 #osgGA
                 -DOSGGA_INCLUDE_DIR:PATH=${OSG_INCLUDES}
                 -DOSGGA_LIBRARY:PATH=${osgGA_LIBRARY}
@@ -114,7 +114,6 @@ elseif(APPLE)
 		set(OsgInstallType "Source And Build Tree")
         #set(OSGBullet_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOSGWORKS_STATIC")
         set(OSGBULLET_ARGS
-        		-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
                 #osg
                 -DOSGInstallType:STRING=${OsgInstallType}
                 -DOSGSourceRoot:STRING=${CMAKE_BINARY_DIR}/modules/omegaOsg/osg-prefix/src/osg
@@ -134,11 +133,12 @@ else()
         set(OsgInstallType "Source And Build Tree")
         #set(OSGBullet_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOSGWORKS_STATIC")
         set(OSGBULLET_ARGS
+        		-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
                 #osg
                 -DOSGInstallType:STRING=${OsgInstallType}
                 -DOSGSourceRoot:STRING=${CMAKE_BINARY_DIR}/modules/omegaOsg/osg-prefix/src/osg
                 -DOSGBuildRoot:STRING=${CMAKE_BINARY_DIR}/modules/omegaOsg/osg-prefix/src/osg-build
-		-DOSG_DIR:PATH=${OSG_INSTALL_DIR}/${OSGWORKS_LIB_SUFFIX}
+		        -DOSG_DIR:PATH=${OSG_INSTALL_DIR}/${OSGWORKS_LIB_SUFFIX}
                 #Bullet
                 -DBulletInstallType:STRING=${BulletInstallType}
                 -DBulletSourceRoot:STRING=${CMAKE_BINARY_DIR}/modules/omegaOsg/bullet-prefix/src/bullet

diff --git a/src/OsgModule.cpp b/src/OsgModule.cpp
@@ -164,7 +164,7 @@ OsgModule::OsgModule():
     String osgv = ostr("%1%.%2%.%3%", %vmaj %vmin %vp);
 
     String libPath = execPath + ":" + execPath + ostr("osg/osgPlugins-%1%:", %osgv) + execPath + String("osg:")+ execPath + ostr("osgPlugins-%1%:", %osgv);
-    ofmsg("OSG Plugin Path(s): %1%", %libPath);
+    oflog(Verbose, "OSG Plugin Path(s): %1%", %libPath);
     reg->setLibraryFilePathList(libPath);
 
     reg->addReaderWriter(new ReaderFreeImage());
@@ -177,7 +177,7 @@ OsgModule::OsgModule():
 ///////////////////////////////////////////////////////////////////////////////
 OsgModule::~OsgModule()
 {
-    omsg("~OsgModule");
+    olog(Verbose, "~OsgModule");
     mysInstance = NULL;
 }
 

diff --git a/src/SceneView.cpp b/src/SceneView.cpp
@@ -113,7 +113,7 @@ SceneView::SceneView(const SceneView& rhs, const osg::CopyOp& copyop):
 ///////////////////////////////////////////////////////////////////////////////
 SceneView::~SceneView()
 {
-    omega::omsg("~SceneView");
+    //omega::omsg("~SceneView");
 }
 
 //class NH: public osg::NotifyHandler