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
7128fefa
Commit
7128fefa
authored
Sep 23, 2017
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile with -DWITHOUT_DYNAMIC_PLUGINS on Unix
parent
f6cb4f0a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
11 deletions
+5
-11
sql/CMakeLists.txt
sql/CMakeLists.txt
+2
-11
storage/mroonga/CMakeLists.txt
storage/mroonga/CMakeLists.txt
+3
-0
No files found.
sql/CMakeLists.txt
View file @
7128fefa
...
@@ -322,18 +322,9 @@ ADD_CUSTOM_TARGET(
...
@@ -322,18 +322,9 @@ ADD_CUSTOM_TARGET(
SET_TARGET_PROPERTIES
(
GenServerSource PROPERTIES EXCLUDE_FROM_ALL TRUE
)
SET_TARGET_PROPERTIES
(
GenServerSource PROPERTIES EXCLUDE_FROM_ALL TRUE
)
IF
(
WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED
)
IF
(
WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED
)
ADD_LIBRARY
(
udf_example MODULE udf_example.c
)
ADD_LIBRARY
(
udf_example MODULE udf_example.c
udf_example.def
)
SET_TARGET_PROPERTIES
(
udf_example PROPERTIES PREFIX
""
)
SET_TARGET_PROPERTIES
(
udf_example PROPERTIES PREFIX
""
)
# udf_example depends on strings
TARGET_LINK_LIBRARIES
(
udf_example strings
)
IF
(
WIN32
)
IF
(
MSVC
)
SET_TARGET_PROPERTIES
(
udf_example PROPERTIES LINK_FLAGS
"/DEF:
${
CMAKE_CURRENT_SOURCE_DIR
}
/udf_example.def"
)
ENDIF
()
TARGET_LINK_LIBRARIES
(
udf_example strings
)
ELSE
()
# udf_example is using safemutex exported by mysqld
TARGET_LINK_LIBRARIES
(
udf_example mysqld
)
ENDIF
()
ENDIF
()
ENDIF
()
FOREACH
(
tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar
FOREACH
(
tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar
...
...
storage/mroonga/CMakeLists.txt
View file @
7128fefa
...
@@ -326,6 +326,9 @@ if(MRN_BUNDLED)
...
@@ -326,6 +326,9 @@ if(MRN_BUNDLED)
STORAGE_ENGINE MODULE_ONLY
STORAGE_ENGINE MODULE_ONLY
RECOMPILE_FOR_EMBEDDED
RECOMPILE_FOR_EMBEDDED
LINK_LIBRARIES
${
MRN_LIBRARIES
}
)
LINK_LIBRARIES
${
MRN_LIBRARIES
}
)
if
(
NOT TARGET mroonga
)
return
()
endif
()
else
()
else
()
add_library
(
mroonga MODULE
${
MRN_ALL_SOURCES
}
)
add_library
(
mroonga MODULE
${
MRN_ALL_SOURCES
}
)
...
...
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