[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37038] trunk/blender: fix for recent cmake changes
Campbell Barton
ideasman42 at gmail.com
Tue May 31 11:27:35 CEST 2011
Revision: 37038
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37038
Author: campbellbarton
Date: 2011-05-31 09:27:33 +0000 (Tue, 31 May 2011)
Log Message:
-----------
fix for recent cmake changes
Modified Paths:
--------------
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/intern/audaspace/CMakeLists.txt
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-05-31 08:50:20 UTC (rev 37037)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-05-31 09:27:33 UTC (rev 37038)
@@ -3,26 +3,36 @@
# Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
# 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})
+macro(file_list_abs
+ files)
+
+ set(files_abs "")
+
+ foreach(fp ${files})
+ get_filename_component(abs_fp ${fp} ABSOLUTE)
+ list(APPEND files_abs "${abs_fp}")
+ message(STATUS "${abs_fp}")
endforeach()
- include_directories(${all_incs})
+
+ set(${files} "${files_abs}")
endmacro()
+
+macro(blender_include_dirs
+ includes)
+ file_list_abs(includes)
+ include_directories(${includes})
+endmacro()
+
+
macro(blender_include_dirs_sys
includes)
-
- foreach(inc ${ARGV})
- get_filename_component(abs_inc ${inc} ABSOLUTE)
- list(APPEND all_incs ${abs_inc})
- endforeach()
- include_directories(SYSTEM ${all_incs})
+ file_list_abs(includes)
+ include_directories(SYSTEM ${includes})
endmacro()
+
macro(blender_source_group
sources)
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-05-31 08:50:20 UTC (rev 37037)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-05-31 09:27:33 UTC (rev 37038)
@@ -207,7 +207,7 @@
add_definitions(-DWITH_SNDFILE)
list(APPEND INC sndfile)
list(APPEND INC_SYS ${SNDFILE_INC})
- set(SNDFILESRC
+ list(APPEND SRC
sndfile/AUD_SndFileFactory.cpp
sndfile/AUD_SndFileReader.cpp
More information about the Bf-blender-cvs
mailing list