Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
424a0cca
Commit
424a0cca
authored
May 12, 2011
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
option to link with jemalloc on *nix, off by default.
parent
754c134e
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+13
-0
13 additions, 0 deletions
CMakeLists.txt
build_files/cmake/macros.cmake
+6
-0
6 additions, 0 deletions
build_files/cmake/macros.cmake
with
19 additions
and
0 deletions
CMakeLists.txt
+
13
−
0
View file @
424a0cca
...
@@ -175,6 +175,10 @@ if(UNIX AND NOT APPLE)
...
@@ -175,6 +175,10 @@ if(UNIX AND NOT APPLE)
endif
()
endif
()
option
(
WITH_PYTHON_INSTALL
"Copy system python into the blender install folder"
ON
)
option
(
WITH_PYTHON_INSTALL
"Copy system python into the blender install folder"
ON
)
# disable for now, but plan to support on all platforms eventually
option
(
WITH_MEM_JEMALLOC
"Enable malloc replacement (http://www.canonware.com/jemalloc)"
OFF
)
mark_as_advanced
(
WITH_MEM_JEMALLOC
)
# Debug
# Debug
option
(
WITH_CXX_GUARDEDALLOC
"Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)"
OFF
)
option
(
WITH_CXX_GUARDEDALLOC
"Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)"
OFF
)
mark_as_advanced
(
WITH_CXX_GUARDEDALLOC
)
mark_as_advanced
(
WITH_CXX_GUARDEDALLOC
)
...
@@ -424,6 +428,15 @@ if(UNIX AND NOT APPLE)
...
@@ -424,6 +428,15 @@ if(UNIX AND NOT APPLE)
set
(
EXPAT_LIB expat
)
set
(
EXPAT_LIB expat
)
endif
()
endif
()
if
(
WITH_MEM_JEMALLOC
)
set
(
JEMALLOC /usr
)
set
(
JEMALLOC_LIBRARY ljemalloc 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")
unset
(
JEMALLOC
)
endif
()
find_package
(
X11 REQUIRED
)
find_package
(
X11 REQUIRED
)
find_path
(
X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h
${
X11_INC_SEARCH_PATH
}
)
find_path
(
X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h
${
X11_INC_SEARCH_PATH
}
)
mark_as_advanced
(
X11_XF86keysym_INCLUDE_PATH
)
mark_as_advanced
(
X11_XF86keysym_INCLUDE_PATH
)
...
...
This diff is collapsed.
Click to expand it.
build_files/cmake/macros.cmake
+
6
−
0
View file @
424a0cca
...
@@ -114,6 +114,9 @@ macro(SETUP_LIBDIRS)
...
@@ -114,6 +114,9 @@ macro(SETUP_LIBDIRS)
link_directories
(
${
PCRE_LIBPATH
}
)
link_directories
(
${
PCRE_LIBPATH
}
)
link_directories
(
${
EXPAT_LIBPATH
}
)
link_directories
(
${
EXPAT_LIBPATH
}
)
endif
()
endif
()
if
(
WITH_MEM_JEMALLOC
)
link_directories
(
${
JEMALLOC_LIBPATH
}
)
endif
()
if
(
WIN32 AND NOT UNIX
)
if
(
WIN32 AND NOT UNIX
)
link_directories
(
${
PTHREADS_LIBPATH
}
)
link_directories
(
${
PTHREADS_LIBPATH
}
)
...
@@ -220,6 +223,9 @@ macro(setup_liblinks
...
@@ -220,6 +223,9 @@ macro(setup_liblinks
target_link_libraries
(
${
target
}
optimized
${
LCMS_LIB
}
)
target_link_libraries
(
${
target
}
optimized
${
LCMS_LIB
}
)
endif
()
endif
()
endif
()
endif
()
if
(
WITH_MEM_JEMALLOC
)
target_link_libraries
(
${
target
}
${
JEMALLOC_LIBRARY
}
)
endif
()
if
(
WIN32 AND NOT UNIX
)
if
(
WIN32 AND NOT UNIX
)
target_link_libraries
(
${
target
}
${
PTHREADS_LIB
}
)
target_link_libraries
(
${
target
}
${
PTHREADS_LIB
}
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment