Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
6ca268bc
Commit
6ca268bc
authored
9 years ago
by
Martyn Gigg
Browse files
Options
Downloads
Patches
Plain Diff
Disable tcmalloc by default.
Many unit tests fail with it enabled.
parent
3769b909
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildconfig/CMake/MSVCSetup.cmake
+6
-6
6 additions, 6 deletions
buildconfig/CMake/MSVCSetup.cmake
with
6 additions
and
6 deletions
buildconfig/CMake/MSVCSetup.cmake
+
6
−
6
View file @
6ca268bc
...
@@ -18,9 +18,9 @@ add_definitions ( -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS )
...
@@ -18,9 +18,9 @@ add_definitions ( -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS )
# Additional compiler flags
# Additional compiler flags
##########################################################################
##########################################################################
# /MP - Compile .cpp files in parallel
# /MP - Compile .cpp files in parallel
# /w34296 - Treat warning C4396, about comparison on unsigned and zero,
# /w34296 - Treat warning C4396, about comparison on unsigned and zero,
# as a level 3 warning
# as a level 3 warning
# /w34389 - Treat warning C4389, about equality comparison on unsigned
# /w34389 - Treat warning C4389, about equality comparison on unsigned
# and signed, as a level 3 warning
# and signed, as a level 3 warning
# /Zc:wchar_t- - Do not treat wchar_t as a builtin type. Required for Qt to
# /Zc:wchar_t- - Do not treat wchar_t as a builtin type. Required for Qt to
# work with wstring
# work with wstring
...
@@ -28,7 +28,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /w34296 /w34389 /Zc:wchar_t-" )
...
@@ -28,7 +28,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /w34296 /w34389 /Zc:wchar_t-" )
# As discussed here: http://code.google.com/p/googletest/issues/detail?id=412
# As discussed here: http://code.google.com/p/googletest/issues/detail?id=412
# gtest requires changing the _VARAIDIC_MAX value for VS2012 as it defaults to 5
# gtest requires changing the _VARAIDIC_MAX value for VS2012 as it defaults to 5
add_definitions
(
-D_variadic_max=10
)
add_definitions
(
-D_variadic_max=10
)
# Set PCH heap limit, the default does not work when running msbuild from the commandline for some reason
# Set PCH heap limit, the default does not work when running msbuild from the commandline for some reason
# Any other value lower or higher seems to work but not the default. It it is fine without this when compiling
# Any other value lower or higher seems to work but not the default. It it is fine without this when compiling
...
@@ -56,12 +56,13 @@ set ( PYTHON_LIBRARIES ${PYTHON_DIR}/libs/python27.lib )
...
@@ -56,12 +56,13 @@ set ( PYTHON_LIBRARIES ${PYTHON_DIR}/libs/python27.lib )
set
(
PYTHON_EXECUTABLE
"
${
PYTHON_DIR
}
/python.exe"
CACHE FILEPATH
"The location of the python executable"
FORCE
)
set
(
PYTHON_EXECUTABLE
"
${
PYTHON_DIR
}
/python.exe"
CACHE FILEPATH
"The location of the python executable"
FORCE
)
# The "pythonw" executable that avoids raising another terminal when it runs. Used for IPython
# The "pythonw" executable that avoids raising another terminal when it runs. Used for IPython
set
(
PYTHONW_EXECUTABLE
"
${
PYTHON_DIR
}
/pythonw.exe"
CACHE FILEPATH
set
(
PYTHONW_EXECUTABLE
"
${
PYTHON_DIR
}
/pythonw.exe"
CACHE FILEPATH
"The location of the pythonw executable. This suppresses the new terminal window on startup"
FORCE
)
"The location of the pythonw executable. This suppresses the new terminal window on startup"
FORCE
)
###########################################################################
###########################################################################
# If required, find tcmalloc
# If required, find tcmalloc
###########################################################################
###########################################################################
option
(
USE_TCMALLOC
"If true, link with tcmalloc"
ON
)
# Not ready for production use with MSVC 2015
option
(
USE_TCMALLOC
"If true, link with tcmalloc"
OFF
)
# If not wanted, just carry on without it
# If not wanted, just carry on without it
if
(
USE_TCMALLOC
)
if
(
USE_TCMALLOC
)
# Only link in release configurations. There seems to be problem linking in debug mode
# Only link in release configurations. There seems to be problem linking in debug mode
...
@@ -102,4 +103,3 @@ set ( LIB_DIR ${BIN_DIR} )
...
@@ -102,4 +103,3 @@ set ( LIB_DIR ${BIN_DIR} )
set
(
PLUGINS_DIR plugins
)
set
(
PLUGINS_DIR plugins
)
set
(
PVPLUGINS_DIR PVPlugins
)
set
(
PVPLUGINS_DIR PVPlugins
)
set
(
PVPLUGINS_SUBDIR PVPlugins
)
# Need to tidy these things up!
set
(
PVPLUGINS_SUBDIR PVPlugins
)
# Need to tidy these things up!
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