Revision: 39171
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39171
Author: campbellbarton
Date: 2011-08-08 05:43:04 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
add missing header to cmake files (else some IDE's wont index it)
Modified Paths:
--------------
trunk/blender/build_files/buildbot/slave_compile.py
trunk/blender/build_files/buildbot/slave_pack.py
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/source/blender/windowmanager/CMakeLists.txt
Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py 2011-08-08 05:21:37 UTC
(rev 39170)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2011-08-08 05:43:04 UTC
(rev 39171)
@@ -134,7 +134,7 @@
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
- scons_options.append('BF_BITNESS='+bitness)
+ scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2011-08-08 05:21:37 UTC
(rev 39170)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2011-08-08 05:43:04 UTC
(rev 39171)
@@ -98,7 +98,7 @@
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
- scons_options.append('BF_BITNESS='+bitness)
+ scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-08-08 05:21:37 UTC
(rev 39170)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-08-08 05:43:04 UTC
(rev 39171)
@@ -62,6 +62,10 @@
foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC})
+ # for checking for invalid includes, disable for regular use
+ ##if(NOT EXISTS "${_ABS_INC}/")
+ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+ ##endif()
endforeach()
include_directories(${_ALL_INCS})
unset(_INC)
@@ -75,6 +79,9 @@
foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC})
+ ##if(NOT EXISTS "${_ABS_INC}/")
+ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+ ##endif()
endforeach()
include_directories(SYSTEM ${_ALL_INCS})
unset(_INC)
Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt 2011-08-08
05:21:37 UTC (rev 39170)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt 2011-08-08
05:43:04 UTC (rev 39171)
@@ -67,6 +67,7 @@
intern/wm_window.c
WM_api.h
+ WM_keymap.h
WM_types.h
wm.h
wm_cursors.h
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
