cmake maintenance, was missing 2 headers and made some minor improvements to cmake_co...

also converted GHOST_SystemWin32.cpp to utf8.

diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py
index 7a3ac9eaa7904e81b3822c0ff9127a67b76647ad..0998d221b0023e336688a3d1f13fa82659b0929e 100644 (file)
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -128,6 +128,10 @@ def cmake_get_src(f):
                             raise Exception("strict formatting not kept '*)' %s:%d" % (f, i))
                         break
 
                             raise Exception("strict formatting not kept '*)' %s:%d" % (f, i))
                         break
 

+                    # replace dirs
+                    l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
+                    
+

                     if not l:
                         pass
                     elif l.startswith("$"):
                     if not l:
                         pass
                     elif l.startswith("$"):


@@ -202,11 +206,14 @@ for hf in sorted(source_list(base, is_c_header)):
 import traceback
 for files in (global_c, global_h):
     for f in sorted(files):
 import traceback
 for files in (global_c, global_h):
     for f in sorted(files):

-        i = 1
-        try:
-            for l in open(f, "r", encoding="utf8"):
-                i += 1
-        except:
-            print("Non utf8: %s:%d" % (f, i))
-            if i > 1:
-                traceback.print_exc()
+        if os.path.exists(f):
+            # ignore outside of our source tree
+            if "extern" not in f:
+                i = 1
+                try:
+                    for l in open(f, "r", encoding="utf8"):
+                        i += 1
+                except:
+                    print("Non utf8: %s:%d" % (f, i))
+                    if i > 1:
+                        traceback.print_exc()

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 7c2a2ddb870f0f0eb096b35bb2df44efa114f492..da26b74880f157574ec486e2ddacc350676bffa1 100644 (file)
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -55,6 +55,7 @@ set(SRC
        GHOST_IEvent.h
        GHOST_IEventConsumer.h
        GHOST_ISystem.h
        GHOST_IEvent.h
        GHOST_IEventConsumer.h
        GHOST_ISystem.h

+       GHOST_ISystemPaths.h

        GHOST_ITimerTask.h
        GHOST_IWindow.h
        GHOST_Path-api.h
        GHOST_ITimerTask.h
        GHOST_IWindow.h
        GHOST_Path-api.h


@@ -78,6 +79,7 @@ set(SRC
        intern/GHOST_ModifierKeys.h
        intern/GHOST_NDOFManager.h
        intern/GHOST_System.h
        intern/GHOST_ModifierKeys.h
        intern/GHOST_NDOFManager.h
        intern/GHOST_System.h

+       intern/GHOST_SystemPaths.h

        intern/GHOST_TimerManager.h
        intern/GHOST_TimerTask.h
        intern/GHOST_Window.h
        intern/GHOST_TimerManager.h
        intern/GHOST_TimerTask.h
        intern/GHOST_Window.h

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 91e497bf631b243da773678f26e971e80c10860a..106c09acd6902773518c3dd0e7d5ae2df26ed3af 100644 (file)
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -871,7 +871,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
                                         * specifies a character code generated by a dead key. A dead key is a key that 
                                         * generates a character, such as the umlaut (double-dot), that is combined with 
                                         * another character to form a composite character. For example, the umlaut-O 
                                         * specifies a character code generated by a dead key. A dead key is a key that 
                                         * generates a character, such as the umlaut (double-dot), that is combined with 
                                         * another character to form a composite character. For example, the umlaut-O 

-                                        * character (Ö) is generated by typing the dead key for the umlaut character, and
+                                        * character (Ö) is generated by typing the dead key for the umlaut character, and

                                         * then typing the O key.
                                         */
                                case WM_SYSDEADCHAR:
                                         * then typing the O key.
                                         */
                                case WM_SYSDEADCHAR: