Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add missing header to cmake files (else some IDE's wont index it)

Browse Source
This commit is contained in:
Campbell Barton
2011-08-08 05:43:04 +00:00
parent 22d2764d50
commit 349c838996
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/buildbot/slave_compile.py
View File

@@ -134,7 +134,7 @@ else:
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib))) scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll))) 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) retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode) sys.exit(retcode)

2
build_files/buildbot/slave_pack.py
View File

@@ -98,7 +98,7 @@ if builder.find('scons') != -1:
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib))) scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll))) 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) retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode) sys.exit(retcode)

7
build_files/cmake/macros.cmake
View File

@@ -62,6 +62,10 @@ macro(blender_include_dirs
foreach(_INC ${ARGV}) foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE) get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC}) 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() endforeach()
include_directories(${_ALL_INCS}) include_directories(${_ALL_INCS})
unset(_INC) unset(_INC)
@@ -75,6 +79,9 @@ macro(blender_include_dirs_sys
foreach(_INC ${ARGV}) foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE) get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC}) list(APPEND _ALL_INCS ${_ABS_INC})
##if(NOT EXISTS "${_ABS_INC}/")
## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
##endif()
endforeach() endforeach()
include_directories(SYSTEM ${_ALL_INCS}) include_directories(SYSTEM ${_ALL_INCS})
unset(_INC) unset(_INC)

1
source/blender/windowmanager/CMakeLists.txt
View File

@@ -67,6 +67,7 @@ set(SRC
intern/wm_window.c intern/wm_window.c
WM_api.h WM_api.h
WM_keymap.h
WM_types.h WM_types.h
wm.h wm.h
wm_cursors.h wm_cursors.h