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
66972aa2
Commit
66972aa2
authored
Aug 10, 2010
by
Jonathan Perkin
Browse files
Options
Browse Files
Download
Plain Diff
Merge to mysql-5.5-bugfixing
parents
bd3aa7eb
aeea7b6d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
36 deletions
+32
-36
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+31
-35
scripts/mysql_config.sh
scripts/mysql_config.sh
+1
-1
No files found.
scripts/CMakeLists.txt
View file @
66972aa2
# Copyright (C) 2006 MySQL AB
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
...
...
@@ -252,43 +251,40 @@ IF(POLICY CMP0007)
CMAKE_POLICY
(
SET CMP0007 OLD
)
ENDIF
()
LIST
(
REMOVE_ITEM mysqlclient_LIB_DEPENDS
""
)
LIST
(
REMOVE_DUPLICATES mysqlclient_LIB_DEPENDS
)
FOREACH
(
lib
${
mysqlclient_LIB_DEPENDS
}
)
# Filter out "general", it is not a library, just CMake hint
IF
(
NOT lib STREQUAL
"general"
AND NOT CLIENT_LIBS MATCHES
"-l
${
lib
}
"
)
IF
(
lib MATCHES
"^
\\
-l"
)
SET
(
CLIENT_LIBS
"
${
CLIENT_LIBS
}
${
lib
}
"
)
ELSEIF
(
lib MATCHES
"^/"
)
# Full path, convert to just filename, strip "lib" prefix and extension
GET_FILENAME_COMPONENT
(
lib
"
${
lib
}
"
NAME_WE
)
STRING
(
REGEX REPLACE
"^lib"
""
lib
"
${
lib
}
"
)
SET
(
CLIENT_LIBS
"
${
CLIENT_LIBS
}
-l
${
lib
}
"
)
ELSE
()
SET
(
CLIENT_LIBS
"
${
CLIENT_LIBS
}
-l
${
lib
}
"
)
ENDIF
()
# Extract dependencies using CMake's internal ${target}_LIB_DEPENDS variable
# returned string in ${var} is can be passed to linker's command line
MACRO
(
EXTRACT_LINK_LIBRARIES target var
)
IF
(
${
target
}
_LIB_DEPENDS
)
LIST
(
REMOVE_ITEM
${
target
}
_LIB_DEPENDS
""
)
LIST
(
REMOVE_DUPLICATES
${
target
}
_LIB_DEPENDS
)
FOREACH
(
lib
${${
target
}
_LIB_DEPENDS
}
)
# Filter out "general", it is not a library, just CMake hint
# Also, remove duplicates
IF
(
NOT lib STREQUAL
"general"
AND NOT
${
var
}
MATCHES
"-l
${
lib
}
"
)
IF
(
lib MATCHES
"^
\\
-l"
)
SET
(
${
var
}
"
${${
var
}}
${
lib
}
"
)
ELSEIF
(
lib MATCHES
"^/"
)
# Full path, convert to just filename, strip "lib" prefix and extension
GET_FILENAME_COMPONENT
(
lib
"
${
lib
}
"
NAME_WE
)
STRING
(
REGEX REPLACE
"^lib"
""
lib
"
${
lib
}
"
)
SET
(
${
var
}
"
${${
var
}}
-l
${
lib
}
"
)
ELSE
()
SET
(
${
var
}
"
${${
var
}}
-l
${
lib
}
"
)
ENDIF
()
ENDIF
()
ENDFOREACH
()
ENDIF
()
ENDFOREACH
()
IF
(
LIBDL AND NOT LIBDL MATCHES
"-l"
)
SET
(
LIBDL
"-l
${
LIBDL
}
"
)
ENDIF
()
IF
(
LIBWRAP
)
SET
(
WRAPLIBS
"-lwrap"
)
ENDIF
()
SET
(
LIBS
"
${
CLIENT_LIBS
}
"
)
IF
(
MSVC
)
STRING
(
REPLACE
"-l"
""
${
var
}
"
${${
var
}}
"
)
ENDIF
()
ENDMACRO
()
IF
(
LIBCRYPT
)
SET
(
LIBS
"
${
LIBS
}
-l
${
LIBCRYPT
}
"
)
ENDIF
()
EXTRACT_LINK_LIBRARIES
(
mysqlclient CLIENT_LIBS
)
EXTRACT_LINK_LIBRARIES
(
mysqlserver LIBS
)
IF
(
MSVC
)
STRING
(
REPLACE
"-l"
""
CLIENT_LIBS
"
${
CLIENT_LIBS
}
"
)
STRING
(
REPLACE
"-l"
""
LIBS
"
${
LIBS
}
"
)
ENDIF
()
# mysql_config evaluates ${LIBDL}, we want to avoid it
# as our CLIENT_LIBS and LIBS are already correct
SET
(
LIBDL
)
SET
(
NON_THREADED_LIBS
${
CLIENT_LIBS
}
)
SET
(
mysql_config_COMPONENT COMPONENT Development
)
...
...
scripts/mysql_config.sh
View file @
66972aa2
...
...
@@ -108,7 +108,7 @@ fi
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
libs
=
"
$ldflags
-L
$pkglibdir
-lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
libs
=
"
$libs
@openssl_libs@ @STATIC_NSS_FLAGS@ "
libs_r
=
"
$ldflags
-L
$pkglibdir
-lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
libs_r
=
"
$ldflags
-L
$pkglibdir
-lmysqlclient_r @ZLIB_DEPS@ @
CLIENT_
LIBS@ @openssl_libs@ "
embedded_libs
=
"
$ldflags
-L
$pkglibdir
-lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
if
[
-r
"
$pkglibdir
/libmygcc.a"
]
;
then
...
...
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