From 20ac472d1f7d85360714168d94e10729c1f9ce8d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 24 May 2017 19:40:08 +0100 Subject: [PATCH] Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config --- CMakeLists.txt | 2 ++ include/osg/Export | 4 ---- src/osg/Config.in | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d86e530c6..a7364bef2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -442,6 +442,8 @@ ENDIF(WIN32 AND NOT ANDROID) OPTION(OSG_NOTIFY_DISABLED "Set to ON to build OpenSceneGraph with the notify() disabled." OFF) +OPTION(OSG_USE_DEPRECATED_API "Set to ON to build OpenSceneGraph with the OSG_USE_DEPREFATED_API #define enabled to allow access to deprecated APIs ." ON) + OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF) MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX) diff --git a/include/osg/Export b/include/osg/Export index 7fd42bfbd..cb23a796c 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -15,10 +15,6 @@ #define OSG_EXPORT_ 1 #include -// define USE_DEPRECATED_API is used to include in API which is being fazed out -// if you can compile your apps with this turned off you are -// well placed for compatibility with future versions. -#define USE_DEPRECATED_API // disable VisualStudio warnings #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS) diff --git a/src/osg/Config.in b/src/osg/Config.in index 5411cf7c8..3d52f9ca3 100644 --- a/src/osg/Config.in +++ b/src/osg/Config.in @@ -33,5 +33,6 @@ #cmakedefine OSG_USE_UTF8_FILENAME #cmakedefine OSG_DISABLE_MSVC_WARNINGS #cmakedefine OSG_PROVIDE_READFILE +#cmakedefine OSG_USE_DEPRECATED_API #endif