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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
675e7e7d
Commit
675e7e7d
authored
Jul 04, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove obsolete checks for -fno-implicit-templates
we stopped using -fno-implicit-templates many years ago
parent
889d8a8f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
22 deletions
+1
-22
extra/yassl/CMakeLists.txt
extra/yassl/CMakeLists.txt
+0
-3
plugin/handler_socket/CMakeLists.txt
plugin/handler_socket/CMakeLists.txt
+1
-8
storage/cassandra/CMakeLists.txt
storage/cassandra/CMakeLists.txt
+0
-1
storage/mroonga/CMakeLists.txt
storage/mroonga/CMakeLists.txt
+0
-1
storage/oqgraph/CMakeLists.txt
storage/oqgraph/CMakeLists.txt
+0
-1
storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
...ge/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
+0
-8
No files found.
extra/yassl/CMakeLists.txt
View file @
675e7e7d
...
@@ -20,9 +20,6 @@ INCLUDE_DIRECTORIES(
...
@@ -20,9 +20,6 @@ INCLUDE_DIRECTORIES(
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/mySTL
)
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/mySTL
)
ADD_DEFINITIONS
(
${
SSL_DEFINES
}
)
ADD_DEFINITIONS
(
${
SSL_DEFINES
}
)
#Remove -fno-implicit-templates
#(yassl sources cannot be compiled with it)
STRING
(
REPLACE
"-fno-implicit-templates"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
SET
(
YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp
SET
(
YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp
src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp
src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp
src/yassl_imp.cpp src/yassl_int.cpp
)
src/yassl_imp.cpp src/yassl_int.cpp
)
...
...
plugin/handler_socket/CMakeLists.txt
View file @
675e7e7d
...
@@ -5,14 +5,7 @@ IF(WIN32)
...
@@ -5,14 +5,7 @@ IF(WIN32)
RETURN
()
RETURN
()
ENDIF
()
ENDIF
()
#Remove -fno-implicit-templates from compiler flags(handlersocket would not work with it)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-Wdeprecated-declarations"
)
STRING
(
REPLACE
"-fno-implicit-templates"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
include
(
CheckCXXCompilerFlag
)
check_cxx_compiler_flag
(
" -Wdeprecated-declarations"
HAVE_CXX_WDEPRECATED_DECLARATIONS
)
IF
(
HAVE_CXX_WDEPRECATED_DECLARATIONS
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated-declarations"
)
ENDIF
()
INCLUDE_DIRECTORIES
(
libhsclient
)
INCLUDE_DIRECTORIES
(
libhsclient
)
...
...
storage/cassandra/CMakeLists.txt
View file @
675e7e7d
...
@@ -21,7 +21,6 @@ IF(EXISTS ${Thrift_LIBS})
...
@@ -21,7 +21,6 @@ IF(EXISTS ${Thrift_LIBS})
SET
(
CMAKE_REQUIRED_INCLUDES
${
Thrift_INCLUDE_DIRS
}
)
SET
(
CMAKE_REQUIRED_INCLUDES
${
Thrift_INCLUDE_DIRS
}
)
STRING
(
REPLACE
"-fno-exceptions"
""
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
STRING
(
REPLACE
"-fno-exceptions"
""
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
STRING
(
REPLACE
"-fno-implicit-templates"
""
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
SET
(
CMAKE_REQUIRED_INCLUDES
"
${
Thrift_INCLUDE_DIRS
}
/.."
)
SET
(
CMAKE_REQUIRED_INCLUDES
"
${
Thrift_INCLUDE_DIRS
}
/.."
)
CHECK_CXX_SOURCE_COMPILES
(
CHECK_CXX_SOURCE_COMPILES
(
...
...
storage/mroonga/CMakeLists.txt
View file @
675e7e7d
...
@@ -361,7 +361,6 @@ else()
...
@@ -361,7 +361,6 @@ else()
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-Wno-unused-parameter"
)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-Wno-unused-parameter"
)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-Wno-strict-aliasing"
)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-Wno-strict-aliasing"
)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-Wno-deprecated"
)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-Wno-deprecated"
)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-fno-implicit-templates"
)
if
((
"
${
MYSQL_VARIANT
}
"
STREQUAL
"MariaDB"
)
OR
if
((
"
${
MYSQL_VARIANT
}
"
STREQUAL
"MariaDB"
)
OR
(
"
${
MYSQL_VARIANT
}
"
STREQUAL
"MySQL"
AND
(
"
${
MYSQL_VARIANT
}
"
STREQUAL
"MySQL"
AND
${
MYSQL_VERSION
}
VERSION_LESS
"5.7.0"
))
${
MYSQL_VERSION
}
VERSION_LESS
"5.7.0"
))
...
...
storage/oqgraph/CMakeLists.txt
View file @
675e7e7d
...
@@ -58,7 +58,6 @@ IF(MSVC)
...
@@ -58,7 +58,6 @@ IF(MSVC)
ELSE
(
MSVC
)
ELSE
(
MSVC
)
# Fix lp bug 1221555 with -fpermissive, so that errors in gcc 4.7 become warnings for the time being
# Fix lp bug 1221555 with -fpermissive, so that errors in gcc 4.7 become warnings for the time being
STRING
(
REPLACE
"-fno-exceptions"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"-fno-exceptions"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"-fno-implicit-templates"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated -fno-strict-aliasing -fpermissive"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated -fno-strict-aliasing -fpermissive"
)
ENDIF
(
MSVC
)
ENDIF
(
MSVC
)
...
...
storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
View file @
675e7e7d
...
@@ -79,14 +79,6 @@ set_cflags_if_supported(
...
@@ -79,14 +79,6 @@ set_cflags_if_supported(
)
)
## set_cflags_if_supported_named("-Weffc++" -Weffcpp)
## set_cflags_if_supported_named("-Weffc++" -Weffcpp)
if
(
CMAKE_CXX_FLAGS MATCHES -fno-implicit-templates
)
# must append this because mysql sets -fno-implicit-templates and we need to override it
check_cxx_compiler_flag
(
-fimplicit-templates HAVE_CXX_IMPLICIT_TEMPLATES
)
if
(
HAVE_CXX_IMPLICIT_TEMPLATES
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fimplicit-templates"
)
endif
()
endif
()
## Clang has stricter POD checks. So, only enable this warning on our other builds (Linux + GCC)
## Clang has stricter POD checks. So, only enable this warning on our other builds (Linux + GCC)
if
(
NOT CMAKE_CXX_COMPILER_ID MATCHES Clang
)
if
(
NOT CMAKE_CXX_COMPILER_ID MATCHES Clang
)
set_cflags_if_supported
(
set_cflags_if_supported
(
...
...
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