CMake: only quiet warnings for generated rna files
authorCampbell Barton <ideasman42@gmail.com>
Sun, 8 Feb 2015 03:33:06 +0000 (14:33 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 8 Feb 2015 04:08:31 +0000 (15:08 +1100)
also minor warning cleanup

intern/smoke/intern/spectrum.cpp
source/blender/blenkernel/intern/bpath.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_sound_api.c
source/blender/makesrna/intern/rna_vfont_api.c
source/blender/render/intern/source/bake_api.c

index e1c2b4d..15e4d0c 100644 (file)
@@ -363,7 +363,7 @@ static void spectrum_to_xyz(double (*spec_intens)(double wavelength),
     Calculate, by Planck's radiation law, the emittance of a black body
     of temperature bbTemp at the given wavelength (in metres).  */
 
-double bbTemp = 5000;                 /* Hidden temperature argument
+static double bbTemp = 5000;          /* Hidden temperature argument
                                          to BB_SPECTRUM. */
 static double bb_spectrum(double wavelength)
 {
index e6bfd5c..fc3c1a2 100644 (file)
@@ -284,7 +284,7 @@ static bool findMissingFiles_visit_cb(void *userdata, char *path_dst, const char
        filename_new[0] = '\0';
 
        found = findFileRecursive(filename_new,
-                                 data->searchdir, BLI_path_basename((char *)path_src),
+                                 data->searchdir, BLI_path_basename(path_src),
                                  &filesize, &recur_depth);
 
        if (filesize == -1) { /* could not open dir */
@@ -296,7 +296,7 @@ static bool findMissingFiles_visit_cb(void *userdata, char *path_dst, const char
        else if (found == false) {
                BKE_reportf(data->reports, RPT_WARNING,
                            "Could not find '%s' in '%s'",
-                           BLI_path_basename((char *)path_src), data->searchdir);
+                           BLI_path_basename(path_src), data->searchdir);
                return false;
        }
        else {
index 09c3047..fac1a05 100644 (file)
@@ -106,7 +106,7 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op)
                        const int old_size = BKE_brush_size_get(scene, brush);
                        int size = (int)(scalar * old_size);
 
-                       if (fabs(old_size - size) < U.pixelsize) {
+                       if (abs(old_size - size) < U.pixelsize) {
                                if (scalar > 1) {
                                        size += U.pixelsize;
                                }
index 6df9e3c..ec82fca 100644 (file)
@@ -28,8 +28,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
 endif()
 
-# message(STATUS "Configuring makesrna")
-
 # files rna_access.c rna_define.c makesrna.c intentionally excluded.
 set(DEFSRC
        rna_ID.c
@@ -128,6 +126,21 @@ set(APISRC
 string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
 set_source_files_properties(${GENSRC} PROPERTIES GENERATED TRUE)
 
+# --------------------------
+# CFLAGS for Generated Files
+#
+# less strict flags for generated source
+set(GENSRC_CFLAGS)
+if(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+       set(GENSRC_CFLAGS "-Wno-missing-prototypes")
+endif()
+
+if(GENSRC_CFLAGS)
+       set_source_files_properties(${GENSRC} PROPERTIES COMPILE_FLAGS "${GENSRC_CFLAGS}")
+endif()
+unset(GENSRC_CFLAGS)
+
+
 set(SRC_RNA_INC
        ../RNA_access.h
        ../RNA_define.h
@@ -316,9 +329,6 @@ add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})
 target_link_libraries(makesrna bf_dna)
 target_link_libraries(makesrna bf_dna_blenlib)
 
-# too many warnings with clang
-remove_cc_flag("-Wmissing-prototypes")
-
 # Output rna_*_gen.c
 # note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes
 add_custom_command(
index 07b6598..0164daa 100644 (file)
@@ -32,6 +32,8 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
+#include "rna_internal.h"
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_packedFile.h"
index 6e6c08d..d92e75d 100644 (file)
@@ -32,6 +32,8 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
+#include "rna_internal.h"
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_packedFile.h"
index 90deac2..48ef291 100644 (file)
@@ -444,7 +444,7 @@ bool RE_bake_pixels_populate_from_objects(
        size_t i;
        int primitive_id;
        float u, v;
-       float imat_low [4][4];
+       float imat_low[4][4];
        bool is_cage = me_cage != NULL;
        bool result = true;