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
216d5450
Commit
216d5450
authored
Nov 07, 2011
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add version to the libmysqld.so
parent
360f53d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
cmake/libutils.cmake
cmake/libutils.cmake
+10
-1
libmysqld/CMakeLists.txt
libmysqld/CMakeLists.txt
+1
-1
No files found.
cmake/libutils.cmake
View file @
216d5450
...
@@ -214,7 +214,7 @@ ENDMACRO()
...
@@ -214,7 +214,7 @@ ENDMACRO()
#)
#)
MACRO
(
MERGE_LIBRARIES
)
MACRO
(
MERGE_LIBRARIES
)
MYSQL_PARSE_ARGUMENTS
(
ARG
MYSQL_PARSE_ARGUMENTS
(
ARG
"EXPORTS;OUTPUT_NAME;COMPONENT"
"EXPORTS;OUTPUT_NAME;COMPONENT
;VERSION;SOVERSION
"
"STATIC;SHARED;MODULE;NOINSTALL"
"STATIC;SHARED;MODULE;NOINSTALL"
${
ARGN
}
${
ARGN
}
)
)
...
@@ -253,7 +253,16 @@ MACRO(MERGE_LIBRARIES)
...
@@ -253,7 +253,16 @@ MACRO(MERGE_LIBRARIES)
IF
(
NOT ARG_NOINSTALL
)
IF
(
NOT ARG_NOINSTALL
)
ADD_VERSION_INFO
(
${
TARGET
}
SHARED SRC
)
ADD_VERSION_INFO
(
${
TARGET
}
SHARED SRC
)
ENDIF
()
ENDIF
()
IF
(
ARG_VERSION
)
SET
(
VERS VERSION
${
ARG_VERSION
}
)
ENDIF
()
ADD_LIBRARY
(
${
TARGET
}
${
LIBTYPE
}
${
SRC
}
)
ADD_LIBRARY
(
${
TARGET
}
${
LIBTYPE
}
${
SRC
}
)
IF
(
ARG_VERSION
)
SET_TARGET_PROPERTIES
(
${
TARGET
}
PROPERTIES VERSION
${
ARG_VERSION
}
)
ENDIF
()
IF
(
ARG_SOVERSION
)
SET_TARGET_PROPERTIES
(
${
TARGET
}
PROPERTIES SOVERSION
${
ARG_VERSION
}
)
ENDIF
()
TARGET_LINK_LIBRARIES
(
${
TARGET
}
${
LIBS
}
)
TARGET_LINK_LIBRARIES
(
${
TARGET
}
${
LIBS
}
)
IF
(
ARG_OUTPUT_NAME
)
IF
(
ARG_OUTPUT_NAME
)
SET_TARGET_PROPERTIES
(
${
TARGET
}
PROPERTIES OUTPUT_NAME
"
${
ARG_OUTPUT_NAME
}
"
)
SET_TARGET_PROPERTIES
(
${
TARGET
}
PROPERTIES OUTPUT_NAME
"
${
ARG_OUTPUT_NAME
}
"
)
...
...
libmysqld/CMakeLists.txt
View file @
216d5450
...
@@ -147,6 +147,6 @@ ENDIF()
...
@@ -147,6 +147,6 @@ ENDIF()
IF
(
NOT DISABLE_SHARED
)
IF
(
NOT DISABLE_SHARED
)
MERGE_LIBRARIES
(
libmysqld SHARED mysqlserver EXPORTS
${
CLIENT_API_FUNCTIONS
}
MERGE_LIBRARIES
(
libmysqld SHARED mysqlserver EXPORTS
${
CLIENT_API_FUNCTIONS
}
COMPONENT Embedded
)
COMPONENT Embedded
VERSION
${
SHARED_LIB_MAJOR_VERSION
}
)
SET_TARGET_PROPERTIES
(
libmysqld PROPERTIES PREFIX
""
)
SET_TARGET_PROPERTIES
(
libmysqld PROPERTIES PREFIX
""
)
ENDIF
()
ENDIF
()
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