[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37399] trunk/blender: fix for using system includes, the include macro wasn' t un-setting the previous include list so system includes could be mixed up with non system includes .

[Campbell Barton]

Revision: 37399
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37399
Author:   campbellbarton
Date:     2011-06-11 06:00:28 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes.

Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C

Modified Paths:
--------------
    trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blenderplayer/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake	2011-06-11 06:00:10 UTC (rev 37398)
+++ trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake	2011-06-11 06:00:28 UTC (rev 37399)
@@ -53,8 +53,17 @@
 	if(NOT _Found_PYTHON_H)
 		message(FATAL_ERROR "Python.h not found")
 	endif()
+	
+	unset(_Found_PYTHON_H)
+	unset(_Python_HEADER)
+	unset(_CURRENT_ABI_FLAGS)
+	unset(_CURRENT_PATH)
+	
 endif()
 
+unset(_Python_ABI_FLAGS)
+unset(_Python_PATHS)
+
 #=============================================================================
 # now the python versions are found
 

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-06-11 06:00:10 UTC (rev 37398)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-06-11 06:00:28 UTC (rev 37399)
@@ -5,22 +5,28 @@
 # use it instead of include_directories()
 macro(blender_include_dirs
 	includes)
-
-	foreach(inc ${ARGV})
-		get_filename_component(abs_inc ${inc} ABSOLUTE)
-		list(APPEND all_incs ${abs_inc})
+	set(_ALL_INCS "")
+	foreach(_INC ${ARGV})
+		get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+		list(APPEND _ALL_INCS ${_ABS_INC})
 	endforeach()
-	include_directories(${all_incs})
+	include_directories(${_ALL_INCS})
+	unset(_INC)
+	unset(_ABS_INC)
+	unset(_ALL_INCS)
 endmacro()
 
 macro(blender_include_dirs_sys
 	includes)
-
-	foreach(inc ${ARGV})
-		get_filename_component(abs_inc ${inc} ABSOLUTE)
-		list(APPEND all_incs ${abs_inc})
+	set(_ALL_INCS "")
+	foreach(_INC ${ARGV})
+		get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+		list(APPEND _ALL_INCS ${_ABS_INC})
 	endforeach()
-	include_directories(SYSTEM ${all_incs})
+	include_directories(SYSTEM ${_ALL_INCS})
+	unset(_INC)
+	unset(_ABS_INC)
+	unset(_ALL_INCS)
 endmacro()
 
 macro(blender_source_group
@@ -29,14 +35,17 @@
 	# Group by location on disk
 	source_group("Source Files" FILES CMakeLists.txt)
 
-	foreach(SRC ${sources})
-		get_filename_component(SRC_EXT ${SRC} EXT)
-		if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
-			source_group("Header Files" FILES ${SRC})
+	foreach(_SRC ${sources})
+		get_filename_component(_SRC_EXT ${SRC} EXT)
+		if(${_SRC_EXT} MATCHES ".h" OR ${_SRC_EXT} MATCHES ".hpp")
+			source_group("Header Files" FILES ${_SRC})
 		else()
-			source_group("Source Files" FILES ${SRC})
+			source_group("Source Files" FILES ${_SRC})
 		endif()
 	endforeach()
+
+	unset(_SRC)
+	unset(_SRC_EXT)
 endmacro()
 
 
@@ -196,10 +205,11 @@
 	endif()
 	if(WITH_IMAGE_OPENEXR)
 		if(WIN32 AND NOT UNIX)
-			foreach(loop_var ${OPENEXR_LIB})
-				target_link_libraries(${target} debug ${loop_var}_d)
-				target_link_libraries(${target} optimized ${loop_var})
+			foreach(_LOOP_VAR ${OPENEXR_LIB})
+				target_link_libraries(${target} debug ${_LOOP_VAR}_d)
+				target_link_libraries(${target} optimized ${_LOOP_VAR})
 			endforeach()
+			unset(_LOOP_VAR)
 		else()
 			target_link_libraries(${target} ${OPENEXR_LIB})
 		endif()
@@ -212,10 +222,11 @@
 	endif()
 	if(WITH_OPENCOLLADA)
 		if(WIN32 AND NOT UNIX)
-			foreach(loop_var ${OPENCOLLADA_LIB})
-				target_link_libraries(${target} debug ${loop_var}_d)
-				target_link_libraries(${target} optimized ${loop_var})
+			foreach(_LOOP_VAR ${OPENCOLLADA_LIB})
+				target_link_libraries(${target} debug ${_LOOP_VAR}_d)
+				target_link_libraries(${target} optimized ${_LOOP_VAR})
 			endforeach()
+			unset(_LOOP_VAR)
 			target_link_libraries(${target} debug ${PCRE_LIB}_d)
 			target_link_libraries(${target} optimized ${PCRE_LIB})
 			if(EXPAT_LIB)
@@ -472,4 +483,13 @@
 
 	unset(_reset_standard_cflags_rel)
 	unset(_reset_standard_cxxflags_rel)
+
+	# --------------------------------------------------
+	# workaround for omission in cmake 2.8.4's GNU.cmake
+	if(CMAKE_COMPILER_IS_GNUCC)
+		if(NOT DARWIN)
+			set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+		endif()
+	endif()
+
 endmacro()

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2011-06-11 06:00:10 UTC (rev 37398)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2011-06-11 06:00:28 UTC (rev 37399)
@@ -183,6 +183,12 @@
 		message(STATUS "Player Skipping: (${REM_MSG})")
 	endif()
 	target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS})
+
+	unset(SEARCHLIB)
+	unset(SORTLIB)
+	unset(REMLIB)
+	unset(REM_MSG)
+
 # else()
 # 	target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS})
 # endif()

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-06-11 06:00:10 UTC (rev 37398)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-06-11 06:00:28 UTC (rev 37399)
@@ -851,6 +851,12 @@
 		message(STATUS "Blender Skipping: (${REM_MSG})")
 	endif()
 	target_link_libraries(blender ${BLENDER_SORTED_LIBS})
+	
+	unset(SEARCHLIB)
+	unset(SORTLIB)
+	unset(REMLIB)
+	unset(REM_MSG)
+	
 #else()
 #	target_link_libraries(blender ${BLENDER_LINK_LIBS})
 #endif()