diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-25 21:00:24 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-25 21:00:24 +0300 |
| commit | aa224716339ce499731625e9451eda3cfb206283 (patch) | |
| tree | 12aa833ff9443b95a18ee6c8c3740a09c8bcb60d /scripts | |
| parent | 5893ae0b81461da9edcc6d7d0f3bbc55787be446 (diff) | |
| parent | 787ec317784d58ca00c0c8e772173c66c5145f50 (diff) | |
| download | mariadb-git-aa224716339ce499731625e9451eda3cfb206283.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Conflicts:
storage/xtradb/handler/ha_innodb.cc
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index e865edc46c0..d3a7861269c 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -88,7 +88,7 @@ IF(MALLOC_LIB) INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL) ENDIF() -IF(CMAKE_GENERATOR MATCHES "Makefiles") +IF(CMAKE_GENERATOR MATCHES "Makefiles|Ninja") # Strip maintainer mode options if necessary STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}") STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") |