Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
7434de31
Commit
7434de31
authored
Jul 08, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typo in CMakeLists.txt that caused USE_MYSYS_NEW to be set too early and incorrectly
parent
528c1111
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
CMakeLists.txt
CMakeLists.txt
+7
-7
No files found.
CMakeLists.txt
View file @
7434de31
...
...
@@ -303,16 +303,11 @@ ENDIF()
# safemalloc can be enabled and disabled independently
SET
(
WITH_SAFEMALLOC
"AUTO"
CACHE STRING
"Use safemalloc memory debugger. Will result in slower execution. Options are: ON OFF AUTO."
)
# force -DUSE_MYSYS_NEW unless already done by HAVE_CXX_NEW
IF
(
HAVE_CXX_NEW
)
SET
(
DUSE_MYSYS_NEW
"-DUSE_MYSYS_NEW"
)
ENDIF
()
IF
(
WITH_SAFEMALLOC MATCHES
"ON"
)
ADD_DEFINITIONS
(
-DSAFEMALLOC
${
DUSE_MYSYS_NEW
}
)
ADD_DEFINITIONS
(
-DSAFEMALLOC
)
ELSEIF
(
WITH_SAFEMALLOC MATCHES
"AUTO"
AND NOT WIN32 AND NOT WITH_VALGRIND
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC
${
DUSE_MYSYS_NEW
}
"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC"
)
ENDIF
()
# Set commonly used variables
...
...
@@ -350,6 +345,11 @@ ENDIF()
# Run platform tests
INCLUDE
(
configure.cmake
)
# force -DUSE_MYSYS_NEW unless already done by HAVE_CXX_NEW
IF
(
NOT HAVE_CXX_NEW
)
ADD_DEFINITIONS
(
-DUSE_MYSYS_NEW
)
ENDIF
()
# Find header files from the bundled libraries
# (jemalloc, yassl, readline, pcre, etc)
# before the ones installed in the system
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment