CMake: only quiet warnings for generated rna files
also minor warning cleanup
This commit is contained in:
@@ -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
|
Calculate, by Planck's radiation law, the emittance of a black body
|
||||||
of temperature bbTemp at the given wavelength (in metres). */
|
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. */
|
to BB_SPECTRUM. */
|
||||||
static double bb_spectrum(double wavelength)
|
static double bb_spectrum(double wavelength)
|
||||||
{
|
{
|
||||||
|
@@ -284,7 +284,7 @@ static bool findMissingFiles_visit_cb(void *userdata, char *path_dst, const char
|
|||||||
filename_new[0] = '\0';
|
filename_new[0] = '\0';
|
||||||
|
|
||||||
found = findFileRecursive(filename_new,
|
found = findFileRecursive(filename_new,
|
||||||
data->searchdir, BLI_path_basename((char *)path_src),
|
data->searchdir, BLI_path_basename(path_src),
|
||||||
&filesize, &recur_depth);
|
&filesize, &recur_depth);
|
||||||
|
|
||||||
if (filesize == -1) { /* could not open dir */
|
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) {
|
else if (found == false) {
|
||||||
BKE_reportf(data->reports, RPT_WARNING,
|
BKE_reportf(data->reports, RPT_WARNING,
|
||||||
"Could not find '%s' in '%s'",
|
"Could not find '%s' in '%s'",
|
||||||
BLI_path_basename((char *)path_src), data->searchdir);
|
BLI_path_basename(path_src), data->searchdir);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@@ -106,7 +106,7 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op)
|
|||||||
const int old_size = BKE_brush_size_get(scene, brush);
|
const int old_size = BKE_brush_size_get(scene, brush);
|
||||||
int size = (int)(scalar * old_size);
|
int size = (int)(scalar * old_size);
|
||||||
|
|
||||||
if (fabs(old_size - size) < U.pixelsize) {
|
if (abs(old_size - size) < U.pixelsize) {
|
||||||
if (scalar > 1) {
|
if (scalar > 1) {
|
||||||
size += U.pixelsize;
|
size += U.pixelsize;
|
||||||
}
|
}
|
||||||
|
@@ -28,8 +28,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
|
|||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# message(STATUS "Configuring makesrna")
|
|
||||||
|
|
||||||
# files rna_access.c rna_define.c makesrna.c intentionally excluded.
|
# files rna_access.c rna_define.c makesrna.c intentionally excluded.
|
||||||
set(DEFSRC
|
set(DEFSRC
|
||||||
rna_ID.c
|
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}")
|
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)
|
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
|
set(SRC_RNA_INC
|
||||||
../RNA_access.h
|
../RNA_access.h
|
||||||
../RNA_define.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)
|
||||||
target_link_libraries(makesrna bf_dna_blenlib)
|
target_link_libraries(makesrna bf_dna_blenlib)
|
||||||
|
|
||||||
# too many warnings with clang
|
|
||||||
remove_cc_flag("-Wmissing-prototypes")
|
|
||||||
|
|
||||||
# Output rna_*_gen.c
|
# Output rna_*_gen.c
|
||||||
# note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes
|
# note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
|
@@ -32,6 +32,8 @@
|
|||||||
#include "RNA_define.h"
|
#include "RNA_define.h"
|
||||||
#include "RNA_enum_types.h"
|
#include "RNA_enum_types.h"
|
||||||
|
|
||||||
|
#include "rna_internal.h"
|
||||||
|
|
||||||
#ifdef RNA_RUNTIME
|
#ifdef RNA_RUNTIME
|
||||||
|
|
||||||
#include "BKE_packedFile.h"
|
#include "BKE_packedFile.h"
|
||||||
|
@@ -32,6 +32,8 @@
|
|||||||
#include "RNA_define.h"
|
#include "RNA_define.h"
|
||||||
#include "RNA_enum_types.h"
|
#include "RNA_enum_types.h"
|
||||||
|
|
||||||
|
#include "rna_internal.h"
|
||||||
|
|
||||||
#ifdef RNA_RUNTIME
|
#ifdef RNA_RUNTIME
|
||||||
|
|
||||||
#include "BKE_packedFile.h"
|
#include "BKE_packedFile.h"
|
||||||
|
@@ -444,7 +444,7 @@ bool RE_bake_pixels_populate_from_objects(
|
|||||||
size_t i;
|
size_t i;
|
||||||
int primitive_id;
|
int primitive_id;
|
||||||
float u, v;
|
float u, v;
|
||||||
float imat_low [4][4];
|
float imat_low[4][4];
|
||||||
bool is_cage = me_cage != NULL;
|
bool is_cage = me_cage != NULL;
|
||||||
bool result = true;
|
bool result = true;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user