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
8fbf3b43
Commit
8fbf3b43
authored
4 years ago
by
Kitty Barnett
Browse files
Options
Downloads
Patches
Plain Diff
Add ASan as a build option now that Visual Studio supports it
parent
c750a5ac
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/cmake/00-Common.cmake
+7
-0
7 additions, 0 deletions
indra/cmake/00-Common.cmake
indra/cmake/LLSharedLibs.cmake
+7
-0
7 additions, 0 deletions
indra/cmake/LLSharedLibs.cmake
indra/cmake/Linking.cmake
+16
-0
16 additions, 0 deletions
indra/cmake/Linking.cmake
with
30 additions
and
0 deletions
indra/cmake/00-Common.cmake
+
7
−
0
View file @
8fbf3b43
...
...
@@ -32,6 +32,9 @@ set(CMAKE_CXX_FLAGS_DEBUG "$ENV{LL_BUILD_DEBUG}")
# Portable compilation flags.
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DADDRESS_SIZE=
${
ADDRESS_SIZE
}
"
)
# Configure asan
set
(
ASAN OFF CACHE BOOL
"Enable use of asan in builds"
)
# Configure crash reporting
set
(
RELEASE_CRASH_REPORTING OFF CACHE BOOL
"Enable use of crash reporting in release builds"
)
set
(
NON_RELEASE_CRASH_REPORTING OFF CACHE BOOL
"Enable use of crash reporting in developer builds"
)
...
...
@@ -63,6 +66,10 @@ if (WINDOWS)
# http://www.cmake.org/pipermail/cmake/2009-September/032143.html
string
(
REPLACE
"/Zm1000"
" "
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
if
(
ASAN
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/fsanitize=address"
)
endif
(
ASAN
)
# Without PreferredToolArchitecture=x64, as of 2020-06-26 the 32-bit
# compiler on our TeamCity build hosts has started running out of virtual
# memory for the precompiled header file.
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/LLSharedLibs.cmake
+
7
−
0
View file @
8fbf3b43
...
...
@@ -18,6 +18,13 @@ macro(ll_deploy_sharedlibs_command target_exe)
if
(
NOT DARWIN
)
if
(
WINDOWS
)
SET_TEST_PATH
(
SEARCH_DIRS
)
if
(
ASAN
)
if
(
ADDRESS_SIZE EQUAL 32
)
LIST
(
APPEND SEARCH_DIRS
"$ENV{VCToolsInstallDir}bin
\\
Hostx64
\\
x86"
)
else
(
ADDRESS_SIZE EQUAL 32
)
LIST
(
APPEND SEARCH_DIRS
"$ENV{VCToolsInstallDir}bin
\\
Hostx64
\\
x64"
)
endif
(
ADDRESS_SIZE EQUAL 32
)
endif
(
ASAN
)
LIST
(
APPEND SEARCH_DIRS
"$ENV{SystemRoot}/system32"
)
elseif
(
LINUX
)
SET_TEST_PATH
(
SEARCH_DIRS
)
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/Linking.cmake
+
16
−
0
View file @
8fbf3b43
...
...
@@ -69,6 +69,22 @@ if (WINDOWS)
ole32
dbghelp
)
if
(
ASAN
)
if
(
ADDRESS_SIZE EQUAL 32
)
set
(
WINDOWS_LIBRARIES
${
WINDOWS_LIBRARIES
}
clang_rt.asan_dynamic_runtime_thunk-i386
clang_rt.asan_dynamic-i386
)
else
(
ADDRESS_SIZE EQUAL 32
)
set
(
WINDOWS_LIBRARIES
${
WINDOWS_LIBRARIES
}
clang_rt.asan_dynamic_runtime_thunk-x86_64
clang_rt.asan_dynamic-x86_64
)
endif
(
ADDRESS_SIZE EQUAL 32
)
endif
(
ASAN
)
else
(
WINDOWS
)
set
(
WINDOWS_LIBRARIES
""
)
endif
(
WINDOWS
)
...
...
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