fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 May 2011 10:34:40 +0000 (10:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 May 2011 10:34:40 +0000 (10:34 +0000)
CMakeLists.txt
build_files/cmake/cmake_netbeans_project.py

index 7abb6daa4dfdc11ccca812bb8ec3bd980e5b1883..4304686544a440b089852025b5712e6ad6c9027b 100644 (file)
@@ -430,7 +430,7 @@ if(UNIX AND NOT APPLE)
 
        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")
index 8b6caf7deba088df421434c194e9bda13cd6322e..2d04c6e5463cb0d003ef9c7f1f17a16d97a57a87 100755 (executable)
@@ -145,7 +145,10 @@ def create_nb_project_main():
         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')