Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-10-23 21:52:20 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-23 21:52:20 +0400
commit4a04f7206914a49f5f95adc5eb786237f1a9f547 (patch)
tree78aed2fa481f972fac0965f814bebebe9d71ae65 /build_files
parentf1cea89d99f0c80bdccd2ba1359142b5ff14cdb9 (diff)
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/cmake/cmake_consistency_check.py3
-rwxr-xr-xbuild_files/cmake/cmake_netbeans_project.py1
-rwxr-xr-xbuild_files/cmake/cmake_qtcreator_project.py1
-rw-r--r--build_files/cmake/cmake_static_check_cppcheck.py1
-rw-r--r--build_files/cmake/cmake_static_check_sparse.py1
-rw-r--r--build_files/cmake/cmake_static_check_splint.py1
-rw-r--r--build_files/cmake/macros.cmake29
-rwxr-xr-xbuild_files/cmake/project_info.py3
-rw-r--r--build_files/cmake/project_source_info.py3
9 files changed, 30 insertions, 13 deletions
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py
index 880cb582f1e..b1fc88bfe26 100755
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -75,7 +74,7 @@ def is_c_header(filename):
def is_c(filename):
ext = splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+ return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
def is_c_any(filename):
diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py
index 02dfec06c0b..769b4adb37b 100755
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py
index 2a2774c9944..fc5c00ec2ec 100755
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py
index 1c8d619a513..8720cb83054 100644
--- a/build_files/cmake/cmake_static_check_cppcheck.py
+++ b/build_files/cmake/cmake_static_check_cppcheck.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/build_files/cmake/cmake_static_check_sparse.py b/build_files/cmake/cmake_static_check_sparse.py
index aa2d56e5509..bd7629e4229 100644
--- a/build_files/cmake/cmake_static_check_sparse.py
+++ b/build_files/cmake/cmake_static_check_sparse.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/build_files/cmake/cmake_static_check_splint.py b/build_files/cmake/cmake_static_check_splint.py
index 08d83337426..edfefa3d068 100644
--- a/build_files/cmake/cmake_static_check_splint.py
+++ b/build_files/cmake/cmake_static_check_splint.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index e4665124c8f..bf90ef85eb0 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1,5 +1,4 @@
# -*- mode: cmake; indent-tabs-mode: t; -*-
-# $Id$
# foo_bar.spam --> foo_barMySuffix.spam
@@ -17,7 +16,7 @@ macro(file_suffix
unset(_file_name_EXT)
endmacro()
-# usefil for adding debug suffix to library lists:
+# useful for adding debug suffix to library lists:
# /somepath/foo.lib --> /somepath/foo_d.lib
macro(file_list_suffix
fp_list_new fp_list fn_suffix
@@ -413,6 +412,32 @@ macro(remove_strict_flags)
endmacro()
+# note, we can only append flags on a single file so we need to negate the options.
+# at the moment we cant shut up ffmpeg deprecations, so use this, but will
+# probably add more removals here.
+macro(remove_strict_flags_file
+ filenames)
+
+ foreach(_SOURCE ${ARGV})
+
+ if(CMAKE_COMPILER_IS_GNUCC)
+ set_source_files_properties(${_SOURCE}
+ PROPERTIES
+ COMPILE_FLAGS "-Wno-deprecated-declarations"
+ )
+ endif()
+
+ if(MSVC)
+ # TODO
+ endif()
+
+ endforeach()
+
+ unset(_SOURCE)
+
+endmacro()
+
+
macro(ADD_CHECK_C_COMPILER_FLAG
_CFLAGS
_CACHE_VAR
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py
index db12884469b..8e813d39b64 100755
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -105,7 +104,7 @@ def is_glsl(filename):
def is_c(filename):
ext = splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+ return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
def is_c_any(filename):
diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py
index c636d778aaa..5d646eea2c1 100644
--- a/build_files/cmake/project_source_info.py
+++ b/build_files/cmake/project_source_info.py
@@ -1,4 +1,3 @@
-# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -41,7 +40,7 @@ def is_c_header(filename):
def is_c(filename):
ext = os.path.splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+ return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
def is_c_any(filename):