fix for cmake glew includes (tested with mingw), also made qtcreator project generato...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Apr 2011 03:02:40 +0000 (03:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Apr 2011 03:02:40 +0000 (03:02 +0000)
28 files changed:
build_files/cmake/cmake_qtcreator_project.py
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/space_action/CMakeLists.txt
source/blender/editors/space_buttons/CMakeLists.txt
source/blender/editors/space_console/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sound/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_time/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt

index 617f2c2..85d3754 100644 (file)
@@ -114,10 +114,11 @@ def cmake_advanced_info():
     """
 
     def create_eclipse_project(CMAKE_DIR):
+        print("CMAKE_DIR %r" % CMAKE_DIR)
         if sys.platform == "win32":
-            cmd = 'cmake %r -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
+            cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
         else:
-            cmd = 'cmake %r -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
+            cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
 
         os.system(cmd)
 
@@ -202,7 +203,6 @@ def cmake_compiler_defines():
 
     os.remove(temp_c)
     os.remove(temp_def)
-
     return lines
 
 
@@ -252,7 +252,8 @@ def create_qtc_project_main():
         f = open(qtc_cfg, 'w')
         f.write("// ADD PREDEFINED MACROS HERE!\n")
         defines_final = [("#define %s %s" % item) for item in defines]
-        defines_final += cmake_compiler_defines()  # defines from the compiler
+        if sys.platform != "win32":
+            defines_final += cmake_compiler_defines()  # defines from the compiler
         f.write("\n".join(defines_final))
 
     print("Blender project file written to: %s" % qtc_prj)
index f506d27..8fc1ec4 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 8bbfc34..3234254 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 4269c59..71199ee 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 09ea9f9..cf0c903 100644 (file)
@@ -32,6 +32,7 @@ set(INC
        ../../python
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 8ff323d..a03bf17 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index a0aa3e4..8d51d6e 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/elbeem/extern
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index f276cc3..a583d75 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index a22ed87..248b6ea 100644 (file)
@@ -31,6 +31,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 9280e4d..7c52f4a 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 94b3f1c..e967094 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d1cb716..14e7f4a 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d77ed30..0a3bce7 100644 (file)
@@ -31,6 +31,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 5b5fd41..59f2b22 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index f682580..e3ac300 100644 (file)
@@ -31,6 +31,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index c7e0b23..16f4b2d 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d33bf2d..6323ef7 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../editors/interface
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index f850373..59ccb20 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 955f570..8604ba3 100644 (file)
@@ -33,6 +33,7 @@ set(INC
        ../../render/extern/include
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 6dc5792..871dec4 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 165a435..974dc66 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d162ac2..9dc0b7a 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d005483..9e70d1d 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 21481dc..6241d39 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index c872708..654930f 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index fc9dd8c..9744887 100644 (file)
@@ -33,6 +33,7 @@ set(INC
        ../../render/extern/include
        ../../../../intern/guardedalloc
        ../../../../intern/smoke/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 6758b94..1455dc7 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 852b120..16e3536 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC