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
d47ac4d7
Commit
d47ac4d7
authored
Nov 09, 2009
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix problems found by Joro (Xcode generator specific)
parent
360ee02d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
libmysqld/examples/CMakeLists.txt
libmysqld/examples/CMakeLists.txt
+6
-2
sql/CMakeLists.txt
sql/CMakeLists.txt
+4
-1
No files found.
libmysqld/examples/CMakeLists.txt
View file @
d47ac4d7
...
@@ -39,9 +39,13 @@ IF(CMAKE_GENERATOR MATCHES "Xcode")
...
@@ -39,9 +39,13 @@ IF(CMAKE_GENERATOR MATCHES "Xcode")
# It does not seem possible to tell Xcode the resulting target might need
# It does not seem possible to tell Xcode the resulting target might need
# to be linked with C++ runtime. The project needs to have at least one C++
# to be linked with C++ runtime. The project needs to have at least one C++
# file. Add a dummy one.
# file. Add a dummy one.
MYSQL_CREATE_EMPTY_FILE
(
mysql_client_test_embedded_dummy.cc
)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/mysql_client_test_embedded_dummy.cc
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
CMAKE_CURRENT_BINARY_DIR
}
/mysql_client_test_embedded_dummy.cc
)
ADD_EXECUTABLE
(
mysql_client_test_embedded
ADD_EXECUTABLE
(
mysql_client_test_embedded
mysql_client_test_embedded_dummy.cc
${
CMAKE_CURRENT_BINARY_DIR
}
/
mysql_client_test_embedded_dummy.cc
../../tests/mysql_client_test.c
)
../../tests/mysql_client_test.c
)
ELSE
()
ELSE
()
ADD_EXECUTABLE
(
mysql_client_test_embedded ../../tests/mysql_client_test.c
)
ADD_EXECUTABLE
(
mysql_client_test_embedded ../../tests/mysql_client_test.c
)
...
...
sql/CMakeLists.txt
View file @
d47ac4d7
...
@@ -187,6 +187,9 @@ IF(WIN32 OR HAVE_DLOPEN)
...
@@ -187,6 +187,9 @@ IF(WIN32 OR HAVE_DLOPEN)
SET_TARGET_PROPERTIES
(
udf_example PROPERTIES LINK_FLAGS
"/DEF:
${
CMAKE_CURRENT_SOURCE_DIR
}
/udf_example.def"
)
SET_TARGET_PROPERTIES
(
udf_example PROPERTIES LINK_FLAGS
"/DEF:
${
CMAKE_CURRENT_SOURCE_DIR
}
/udf_example.def"
)
ENDIF
()
ENDIF
()
TARGET_LINK_LIBRARIES
(
udf_example strings
)
TARGET_LINK_LIBRARIES
(
udf_example strings
)
ELSE
()
# udf_example is using safemutex exported by mysqld
TARGET_LINK_LIBRARIES
(
udf_example mysqld
)
ENDIF
()
ENDIF
()
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