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
6afe013c
Commit
6afe013c
authored
Aug 02, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
always build wsrep libraries static
even if -DBUILD_SHARED_LIBS=ON was used
parent
58bfe9da
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
CMakeLists.txt
CMakeLists.txt
+4
-7
cmake/wsrep.cmake
cmake/wsrep.cmake
+7
-0
No files found.
CMakeLists.txt
View file @
6afe013c
...
...
@@ -145,9 +145,6 @@ INCLUDE(mysql_version)
INCLUDE
(
cpack_source_ignore_files
)
INCLUDE
(
install_layout
)
INCLUDE
(
submodules
)
INCLUDE
(
wsrep
)
INCLUDE
(
cpack_rpm
)
INCLUDE
(
cpack_deb
)
# Add macros
INCLUDE
(
character_sets
)
...
...
@@ -244,6 +241,10 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN)
MY_CHECK_AND_SET_COMPILER_FLAG
(
"-D_FORTIFY_SOURCE=2"
RELEASE RELWITHDEBINFO
)
ENDIF
()
INCLUDE
(
wsrep
)
INCLUDE
(
cpack_rpm
)
INCLUDE
(
cpack_deb
)
# Always enable debug sync for debug builds.
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DENABLED_DEBUG_SYNC"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DENABLED_DEBUG_SYNC"
)
...
...
@@ -425,10 +426,6 @@ IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY
(
unittest/embedded
)
ENDIF
(
WITH_EMBEDDED_SERVER
)
IF
(
WITH_WSREP
)
ADD_SUBDIRECTORY
(
wsrep-lib
)
ENDIF
()
ADD_SUBDIRECTORY
(
mysql-test
)
ADD_SUBDIRECTORY
(
mysql-test/lib/My/SafeProcess
)
ADD_SUBDIRECTORY
(
sql-bench
)
...
...
cmake/wsrep.cmake
View file @
6afe013c
...
...
@@ -17,6 +17,7 @@
#
# Galera library does not compile with windows
#
IF
(
NOT WITHOUT_SERVER
)
IF
(
UNIX
)
SET
(
with_wsrep_default ON
)
ELSE
()
...
...
@@ -57,4 +58,10 @@ Then restart the build.
endif
()
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/wsrep-lib/include
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/wsrep-lib/wsrep-API/v26
)
SET
(
old_BUILD_SHARED_LIBS
${
BUILD_SHARED_LIBS
}
)
SET
(
BUILD_SHARED_LIBS OFF
)
ADD_SUBDIRECTORY
(
wsrep-lib
)
SET
(
BUILD_SHARED_LIBS
${
old_BUILD_SHARED_LIBS
}
)
ENDIF
()
ENDIF
(
NOT WITHOUT_SERVER
)
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