Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
5f872761
Commit
5f872761
authored
14 years ago
by
Nyx (Neal Orman)
Browse files
Options
Downloads
Patches
Plain Diff
no longer using tcmalloc-minimal, replacing cmake config to refer to
full build version.
parent
235a4477
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/cmake/Copy3rdPartyLibs.cmake
+3
-3
3 additions, 3 deletions
indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/GooglePerfTools.cmake
+3
-3
3 additions, 3 deletions
indra/cmake/GooglePerfTools.cmake
with
6 additions
and
6 deletions
indra/cmake/Copy3rdPartyLibs.cmake
+
3
−
3
View file @
5f872761
...
@@ -56,8 +56,8 @@ if(WINDOWS)
...
@@ -56,8 +56,8 @@ if(WINDOWS)
)
)
if
(
USE_GOOGLE_PERFTOOLS
)
if
(
USE_GOOGLE_PERFTOOLS
)
set
(
debug_files
${
debug_files
}
libtcmalloc
_minimal
-debug.dll
)
set
(
debug_files
${
debug_files
}
libtcmalloc-debug.dll
)
set
(
release_files
${
release_files
}
libtcmalloc
_minimal
.dll
)
set
(
release_files
${
release_files
}
libtcmalloc.dll
)
endif
(
USE_GOOGLE_PERFTOOLS
)
endif
(
USE_GOOGLE_PERFTOOLS
)
if
(
FMOD
)
if
(
FMOD
)
...
@@ -262,7 +262,7 @@ elseif(LINUX)
...
@@ -262,7 +262,7 @@ elseif(LINUX)
libopenal.so
libopenal.so
libopenjpeg.so
libopenjpeg.so
libssl.so
libssl.so
libtcmalloc
_minimal
.so
libtcmalloc.so
libuuid.so.16
libuuid.so.16
libuuid.so.16.0.22
libuuid.so.16.0.22
libssl.so.0.9.8
libssl.so.0.9.8
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/GooglePerfTools.cmake
+
3
−
3
View file @
5f872761
...
@@ -7,14 +7,14 @@ else (STANDALONE)
...
@@ -7,14 +7,14 @@ else (STANDALONE)
if
(
WINDOWS
)
if
(
WINDOWS
)
use_prebuilt_binary
(
tcmalloc
)
use_prebuilt_binary
(
tcmalloc
)
set
(
TCMALLOC_LIBRARIES
set
(
TCMALLOC_LIBRARIES
debug libtcmalloc
_minimal
-debug
debug libtcmalloc-debug
optimized libtcmalloc
_minimal
)
optimized libtcmalloc
)
set
(
GOOGLE_PERFTOOLS_FOUND
"YES"
)
set
(
GOOGLE_PERFTOOLS_FOUND
"YES"
)
endif
(
WINDOWS
)
endif
(
WINDOWS
)
if
(
LINUX
)
if
(
LINUX
)
use_prebuilt_binary
(
tcmalloc
)
use_prebuilt_binary
(
tcmalloc
)
set
(
TCMALLOC_LIBRARIES
set
(
TCMALLOC_LIBRARIES
tcmalloc
_minimal
)
tcmalloc
)
set
(
PROFILER_LIBRARIES profiler
)
set
(
PROFILER_LIBRARIES profiler
)
set
(
GOOGLE_PERFTOOLS_INCLUDE_DIR
set
(
GOOGLE_PERFTOOLS_INCLUDE_DIR
${
LIBS_PREBUILT_DIR
}
/include
)
${
LIBS_PREBUILT_DIR
}
/include
)
...
...
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