[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36713] trunk/blender: fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__ .

[Campbell Barton]

Revision: 36713
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36713
Author:   campbellbarton
Date:     2011-05-16 10:34:40 +0000 (Mon, 16 May 2011)
Log Message:
-----------
fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/cmake_netbeans_project.py

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-05-16 08:08:37 UTC (rev 36712)
+++ trunk/blender/CMakeLists.txt	2011-05-16 10:34:40 UTC (rev 36713)
@@ -430,7 +430,7 @@
 
 	if(WITH_MEM_JEMALLOC)
 		set(JEMALLOC /usr)
-		set(JEMALLOC_LIBRARY ljemalloc CACHE STRING "JeMalloc library")
+		set(JEMALLOC_LIBRARY jemalloc CACHE STRING "JeMalloc library")
 		set(JEMALLOC_LIBPATH ${JEMALLOC}/lib  CACHE FILEPATH "JeMalloc library path")
 		# no use for this yet.
 		# set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include  CACHE FILEPATH "JeMalloc include path")

Modified: trunk/blender/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_netbeans_project.py	2011-05-16 08:08:37 UTC (rev 36712)
+++ trunk/blender/build_files/cmake/cmake_netbeans_project.py	2011-05-16 10:34:40 UTC (rev 36713)
@@ -145,7 +145,10 @@
         f.write('    </logicalFolder>\n')
 
         f.write('  </logicalFolder>\n')
-        f.write('  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
+        # default, but this dir is infact not in blender dir so we can ignore it
+        # f.write('  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
+        f.write('  <sourceFolderFilter>^(__pycache__|.*\.py)$</sourceFolderFilter>\n')
+
         f.write('  <sourceRootList>\n')
         f.write('    <Elem>%s</Elem>\n' % SOURCE_DIR)  # base_root_rel
         f.write('  </sourceRootList>\n')