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
03f6657e
Commit
03f6657e
authored
Dec 07, 2009
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
599df1d7
34260722
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
12 deletions
+3
-12
configure.cmake
configure.cmake
+1
-4
extra/CMakeLists.txt
extra/CMakeLists.txt
+2
-8
No files found.
configure.cmake
View file @
03f6657e
...
...
@@ -164,9 +164,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
SET
(
LINK_FLAG_NO_UNDEFINED
"--Wl,--no-undefined"
)
ENDIF
()
IF
(
CMAKE_SYSTEM_NAME MATCHES
"SunOS"
)
SET
(
LINK_FLAG_NO_UNDEFINED
"-z defs"
)
ENDIF
()
#Some OS specific hacks
IF
(
CMAKE_SYSTEM_NAME MATCHES
"FreeBSD"
)
...
...
@@ -286,7 +283,7 @@ IF(UNIX)
FIND_PACKAGE
(
Threads
)
SET
(
CMAKE_REQUIRED_LIBRARIES
${
LIBNLS
}
${
LIBBIND
}
${
LIBCRYPT
}
${
LIBSOCKET
}
${
LIBDL
}
${
CMAKE_THREAD_LIBS_INIT
}
)
${
LIB
M
}
${
LIB
NLS
}
${
LIBBIND
}
${
LIBCRYPT
}
${
LIBSOCKET
}
${
LIBDL
}
${
CMAKE_THREAD_LIBS_INIT
}
)
LINK_LIBRARIES
(
${
CMAKE_THREAD_LIBS_INIT
}
)
...
...
extra/CMakeLists.txt
View file @
03f6657e
...
...
@@ -58,17 +58,11 @@ TARGET_LINK_LIBRARIES(perror mysys)
ADD_EXECUTABLE
(
resolveip resolveip.c
)
TARGET_LINK_LIBRARIES
(
resolveip mysys
)
# On Solaris, inet_aton() function used by resolveip could be in resolv library
IF
(
CMAKE_SYSTEM_NAME STREQUAL
"SunOS"
)
INCLUDE
(
CheckFunctionExists
)
INCLUDE
(
CheckLibraryExists
)
CHECK_FUNCTION_EXISTS
(
inet_aton HAVE_INET_ATON
)
IF
(
NOT HAVE_INET_ATON
)
CHECK_LIBRARY_EXISTS
(
resolv inet_aton
""
HAVE_INET_ATON_IN_RESOLV
)
IF
(
HAVE_INET_ATON_IN_RESOLV
)
TARGET_LINK_LIBRARIES
(
resolveip resolv
)
ENDIF
()
ENDIF
()
MY_SEARCH_LIBS
(
inet_aton
"nsl;socket;resolv"
SOLARIS_NSL
)
TARGET_LINK_LIBRARIES
(
resolveip
${
SOLARIS_NSL
}
)
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