commit c950722384a3e0a79ad0a37fcfb19125ef5174c4 parent 77f7e659d17a2afb05b691e4fa60d7b03ce8f40a Author: Vincent Forest <vincent.forest@meso-star.com> Date: Fri, 11 Jan 2019 16:22:00 +0100 Small clean up Diffstat:
| M | cmake/CMakeLists.txt | | | 7 | ------- |
| M | src/s3d_backend.h | | | 10 | ++-------- |
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -106,13 +106,6 @@ set_target_properties(s3d PROPERTIES VERSION ${VERSION} SOVERSION ${VERSION_MAJOR}) -#if(CMAKE_COMPILER_IS_GNUCXX) FIXME remove this ? -# # Shut up the use of variadic macros by Embree and the use of long long -# # constants by RSys -# set_target_properties(s3d PROPERTIES -# COMPILE_FLAGS "-Wno-variadic-macros -Wno-long-long") -#endif() - rcmake_setup_devel(s3d Star3D ${VERSION} star/s3d_version.h) ################################################################################ diff --git a/src/s3d_backend.h b/src/s3d_backend.h @@ -35,20 +35,14 @@ #include <rsys/rsys.h> -#ifdef COMPILER_GCC - #pragma GCC diagnostic push -/* #pragma GCC diagnostic ignored "-Wpedantic" - #pragma GCC diagnostic ignored "-Wsign-compare" */ -#elif defined(COMPILER_CL) +#ifdef COMPILER_CL #pragma warning(push) /* #pragma warning(disable:4324)*/ /* Structure was padded due to alignment */ #endif #include <embree3/rtcore.h> -#ifdef COMPILER_GCC - #pragma GCC diagnostic pop -#elif defined(COMPILER_CL) +#ifdef COMPILER_CL #pragma warning(pop) #endif