X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FConfig.h.in;h=45852444da47885d9dbde814fcee8851242005e2;hb=1fb645d9cf1026ff09297123d104a2b43c963a93;hp=23c93da087c923e6983ecf934fecf3f27dd8dcff;hpb=84d74813c987aaa92eed8579e2122f67c0d5159d;p=cpPlugins.git diff --git a/lib/cpExtensions/Config.h.in b/lib/cpExtensions/Config.h.in index 23c93da..4585244 100644 --- a/lib/cpExtensions/Config.h.in +++ b/lib/cpExtensions/Config.h.in @@ -9,45 +9,22 @@ * ========================================================================= */ #define cpExtensions_OS_@CMAKE_SYSTEM_NAME@ -#ifdef cpExtensions_OS_Windows -# define cpExtensions_LIB_PREFIX "" -# define cpExtensions_ENV_SEPARATOR ";" -# define cpExtensions_PATH_SEPARATOR '\\' -# define cpExtensions_LIB_EXT ".dll" -#else // cpExtensions_OS_Windows -# define cpExtensions_LIB_PREFIX "lib" -# define cpExtensions_ENV_SEPARATOR ":" -# define cpExtensions_PATH_SEPARATOR '/' -# ifdef cpExtensions_OS_Linux -# define cpExtensions_LIB_EXT ".so" -# else // cpExtensions_OS_Linux -# define cpExtensions_LIB_EXT ".dylib" -# endif // cpExtensions_OS_Linux -#endif // cpExtensions_OS_Windows - -#ifdef cpExtensions_OS_Windows -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif // WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include -# include -#endif // cpExtensions_OS_Windows /* * ========================================================================= * Some global values * ========================================================================= */ - -#define cpExtensions_QT4_USED @QT4_FOUND@ -#if cpExtensions_QT4_USED == 1 -# define cpExtensions_QT4 +#define cpExtensions_QT4_@QT4_FOUND@ +#ifdef cpExtensions_QT4_TRUE +# ifndef cpExtensions_QT4 +# define cpExtensions_QT4 +# endif // cpExtensions_QT4 # define cpExtensions_QVTKWidget @cpPlugins_Qt4_VTKWidget@ # include <@cpPlugins_Qt4_VTKWidget@.h> -#else // cpExtensions_QT4_USED == 1 +#else // cpExtensions_QT4_TRUE # undef cpExtensions_QT4 -#endif // cpExtensions_QT4_USED == 1 +#endif // cpExtensions_QT4_TRUE /* * ========================================================================= @@ -81,6 +58,13 @@ # define cpExtensions_NOEXCEPT throw() #endif +// ------------------------------------------------------------------------- +#ifdef cpExtensions_OS_Windows +# define cpExtensions_SPRINTF( B, S, O ) sprintf_s( B, S, "%s", O ); +#else // cpExtensions_OS_Windows +# define cpExtensions_SPRINTF( B, S, O ) std::sprintf( B, "%s", O ); +#endif // cpExtensions_OS_Windows + #endif // __cpExtensions__Config__h__ // eof - $RCSfile$