X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcpExtensions%2FConfig.h.in;h=6ce007bc8b6f5140c908690bea107bc0dbc05282;hb=a422d88602e9b49085ccfab0ef0f9f2d93fb6a1e;hp=3f8c350e537961424ba743c39e8c4573ca0ed6b7;hpb=8ada00da37d8c4dc70b9387c1147566c62dbd41f;p=cpPlugins.git

diff --git a/lib/cpExtensions/Config.h.in b/lib/cpExtensions/Config.h.in
index 3f8c350..6ce007b 100644
--- a/lib/cpExtensions/Config.h.in
+++ b/lib/cpExtensions/Config.h.in
@@ -1,5 +1,5 @@
-#ifndef __CPEXTENSIONS__CONFIG__H__
-#define __CPEXTENSIONS__CONFIG__H__
+#ifndef __cpExtensions__Config__h__
+#define __cpExtensions__Config__h__
 
 #include <cpExtensions_Export.h>
 
@@ -8,27 +8,19 @@
  * Identify OS
  * =========================================================================
  */
+#define @prj_NAME_OS@
+#define cpExtensions_LIB_PREFIX     "@prj_NAME_LIB_PREFIX@"
+#define cpExtensions_LIB_EXT        "@prj_NAME_LIB_EXT@"
+#define cpExtensions_ENV_SEPARATOR  "@prj_NAME_ENV_SEPARATOR@"
+#define cpExtensions_PATH_SEPARATOR '@prj_NAME_PATH_SEPARATOR@'
 
-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
-#  define cpExtensions_SYS_WINDOWS
-#  define cpExtensions_PATH_SEPARATOR '\\'
+#ifdef cpPlugins_Windows
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  define NOMINMAX
 #  include <windows.h>
 #  include <tchar.h>
-#elif defined( linux ) || defined( __linux )
-#  define cpExtensions_SYS_LINUX
-#  define cpExtensions_PATH_SEPARATOR '/'
-#elif defined( __APPLE__ ) || defined( MACOSX ) || defined( macintosh ) || defined( Macintosh )
-#  define cpExtensions_SYS_MACOS
-#  define cpExtensions_PATH_SEPARATOR '/'
-#elif defined( __FreeBSD__ ) || defined( __FreeBSD_kernel__ )
-#  define cpExtensions_SYS_FREEBSD
-#  define cpExtensions_PATH_SEPARATOR '/'
-#else
-#  error "This operating system is not supported by this project"
 #endif
 
 /*
@@ -40,6 +32,8 @@
 #define cpExtensions_QT4_USED @QT4_FOUND@
 #if cpExtensions_QT4_USED == 1
 #  define cpExtensions_QT4
+#  define cpExtensions_QVTKWidget @cpPlugins_Qt4_VTKWidget@
+#  include <@cpPlugins_Qt4_VTKWidget@.h>
 #else // cpExtensions_QT4_USED == 1
 #  undef cpExtensions_QT4
 #endif // cpExtensions_QT4_USED == 1
@@ -50,38 +44,32 @@
  * =========================================================================
  */
 
-#define cpExtensions_MAJOR_VERSION   @prj_MAJ_VER@
-#define cpExtensions_MINOR_VERSION   @prj_MIN_VER@
-#define cpExtensions_RELEASE_VERSION @prj_REL_VER@
+#define cpExtensions_MAJOR_VERSION   @prj_MAJOR_VERSION@
+#define cpExtensions_MINOR_VERSION   @prj_MINOR_VERSION@
+#define cpExtensions_RELEASE_VERSION @prj_RELEASE_VERSION@
 #define cpExtensions_VERSION         "@prj_VERSION@"
 #define cpExtensions_SHORT_VERSION   "@prj_SHORT_VERSION@"
 
 /*
  * =========================================================================
- * ITK related macros
+ * Language related macros
  * =========================================================================
  */
 
-#include <itkMacro.h>
-#define ITK_MANUAL_INSTANTIATION
-#ifndef ITK_DELETE_FUNCTION
-#  define ITK_DELETE_FUNCTION
-#endif // ITK_DELETE_FUNCTION
-#ifndef ITK_OVERRIDE
-#  define ITK_OVERRIDE
-#endif // ITK_OVERRIDE
-
-/*
- * =========================================================================
- * VTK related macros
- * =========================================================================
- */
-
-#include <vtkConfigure.h>
-#ifndef VTK_OVERRIDE
-#  define VTK_OVERRIDE
-#endif // VTK_OVERRIDE
+#if __cplusplus >= 201103L
+#  define cpExtensions_OVERRIDE override
+#  define cpExtensions_DELETE_FUNCTION =delete
+#  define cpExtensions_NULLPTR  nullptr
+#  define cpExtensions_NOEXCEPT noexcept
+#  define cpExtensions_HAS_CXX11_STATIC_ASSERT
+#  define cpExtensions_HAS_CXX11_RVREF
+#else
+#  define cpExtensions_OVERRIDE
+#  define cpExtensions_DELETE_FUNCTION
+#  define cpExtensions_NULLPTR  NULL
+#  define cpExtensions_NOEXCEPT throw()
+#endif
 
-#endif // __CPEXTENSIONS__CONFIG__H__
+#endif // __cpExtensions__Config__h__
 
 // eof - $RCSfile$