add missing header to cmake files (else some IDE's wont index it)
authorCampbell Barton <ideasman42@gmail.com>
Mon, 8 Aug 2011 05:43:04 +0000 (05:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 8 Aug 2011 05:43:04 +0000 (05:43 +0000)
build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py
build_files/cmake/macros.cmake
source/blender/windowmanager/CMakeLists.txt

index 9dd39ccd3088b27d8e10fe18477072d5d55cf493..b83a65f2466301ecf2bdaed2f458c5f08c7c2dc9 100644 (file)
@@ -134,7 +134,7 @@ else:
             scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
             scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
 
             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)
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
index e779b10bd2a8272f2f76b7dacfedd31f24438ed8..5fdeb4a8ad558c237182235c004e3b0e0fa0c03f 100644 (file)
@@ -98,7 +98,7 @@ if builder.find('scons') != -1:
             scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
             scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
 
             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)
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
index ed200abd4195a016212dfaadbc8b915fff448276..27694bcb8752c59b458f92058ee75c06d515b3a7 100644 (file)
@@ -62,6 +62,10 @@ macro(blender_include_dirs
        foreach(_INC ${ARGV})
                get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
                list(APPEND _ALL_INCS ${_ABS_INC})
        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)
        endforeach()
        include_directories(${_ALL_INCS})
        unset(_INC)
@@ -75,6 +79,9 @@ macro(blender_include_dirs_sys
        foreach(_INC ${ARGV})
                get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
                list(APPEND _ALL_INCS ${_ABS_INC})
        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)
        endforeach()
        include_directories(SYSTEM ${_ALL_INCS})
        unset(_INC)
index 20ac3ba7077bf057b25bd00b78fdf2f32b5915ce..dc83e29b497e2034bbe07b12d87b42a1d32c4156 100644 (file)
@@ -67,6 +67,7 @@ set(SRC
        intern/wm_window.c
 
        WM_api.h
        intern/wm_window.c
 
        WM_api.h
+       WM_keymap.h
        WM_types.h
        wm.h
        wm_cursors.h
        WM_types.h
        wm.h
        wm_cursors.h