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 617f2c2a81f8b6196bce68e96b4683c6e97d3242..85d37549917e9f0fe7e730363c8c2eb6a28b0d5d 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 f506d278cae4f55de0078008108049a023ab6e32..8fc1ec429cce8f0c4bf11e5db3d1d4c31389f3cf 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 8bbfc3465e3892504f1871105885db070f0b790c..3234254f745a1692c843de27e1e5b331bc8663bb 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 4269c590a142def02cf65f3bcdfee1f5ca60bc8a..71199ee9580b1b511a5d74d776ee9def4a003862 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 09ea9f9ad7e73ab46c7fa828d7cc8853652fe5c3..cf0c903e0a5fc6dcb692f9d6a82e005c526b4e04 100644 (file)
@@ -32,6 +32,7 @@ set(INC
        ../../python
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 8ff323d88b6da080a970b11fbafbbc37faf3aeed..a03bf173425b01b1abe7515ba70278f6b9d10ddc 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index a0aa3e489ddd6303fc44c726876e8c47327075fe..8d51d6eec378e3139eec1eec730989b37faafefe 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/elbeem/extern
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index f276cc30c0f288724ef32c028a2c8439b386d537..a583d7535144133e4a45b19018be5c9ee1370602 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index a22ed87c1827df57ce15006451e546f39cbf3ba1..248b6ea2b94418cfe04bff72ea1eb407edb8fe08 100644 (file)
@@ -31,6 +31,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 9280e4d0e7fe21b6b48bb8c02d5e40cbcdd70360..7c52f4a9efb2def7cb9bf9bfc159a5ffa8c94b2b 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 94b3f1c3926e1fab4b4b4ad3d6ce38721d1d670d..e9670949cd5634fe7a49c6a605a05aff695ae31c 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d1cb716fa845301b034fd4bc3a08ba83259a12d5..14e7f4a90d06916a3ac7f550edc25efe4aeb83e6 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d77ed306daf0455c34b710e394717e6d1dcae87d..0a3bce764666a7c8390e6b10fa59e278b3f1fee1 100644 (file)
@@ -31,6 +31,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 5b5fd41bf233d4bc69ef29c5049f1ebdc9e0cd9b..59f2b22516d58474cc691edaa97a7132f63fd987 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index f68258082671412068a630e784c331ecfc970421..e3ac30067a5ec5f396d5675cb2b1b7e47b5e3915 100644 (file)
@@ -31,6 +31,7 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index c7e0b23acabf8608b001af5edc2b44563e639b88..16f4b2dedff33376159172c26b42ad033414b815 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d33bf2db5e1bd9e3ac92a2f195b14fe46c2fd44a..6323ef779c2b45c5e4003f1c9e141f6a808317cb 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../editors/interface
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index f85037398446c76a723bb2e180e568832859a143..59ccb204d8cb02020aa6c6f53e339b5c0db6433c 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 955f57002a52cee186c764e7b11000b9119b4c7b..8604ba3baed16d2ee3cd757895bee41df7d571ad 100644 (file)
@@ -33,6 +33,7 @@ set(INC
        ../../render/extern/include
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 6dc5792ad0c6d530f7b84c2089393ab112e1daf5..871dec4dfc5c0601f0b4bb92101109370b82ca8a 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 165a43568e4eb552d9796b6eda425522eaf08353..974dc66e22c15cd5147a4d817df724a97a1d53d8 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d162ac2f4fc3633a9cf2e4c57294a94fd2b86218..9dc0b7a4258eebe265c72ebe7ade2acadf18d903 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index d00548363819e402e20790df7f0c48cf7fc28a05..9e70d1dbda3e7c1a69c658c14dd0594e46424f8a 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 21481dc6543854f859444184be48b6c8cff97ada..6241d39741746eff48962d4ce611662fdf0f42f7 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index c8727084548da99fcc5fb2bf6e46fea325296feb..654930fc95d296659844e70f6efd3ee600afc040 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index fc9dd8c9bccd2dc1d2e24c93cb7e683fb5bb1dfd..9744887ed9f077a0713ed145c166fccf70b49f3d 100644 (file)
@@ -33,6 +33,7 @@ set(INC
        ../../render/extern/include
        ../../../../intern/guardedalloc
        ../../../../intern/smoke/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 6758b94f53f65ed4e330d3305a2ffa08f920a287..1455dc789c740a699bf753c24dcdee439180660e 100644 (file)
@@ -28,6 +28,7 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 852b120a826f3d29bfb20d17efa995fbad06423b..16e3536b6461fa9549e0371632be59280dd01940 100644 (file)
@@ -29,6 +29,7 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC