Skip to content

Commit d47ac4d

Browse files
author
Vladislav Vaintroub
committed
Fix problems found by Joro (Xcode generator specific)
1 parent 360ee02 commit d47ac4d

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

libmysqld/examples/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,13 @@ IF(CMAKE_GENERATOR MATCHES "Xcode")
3939
# It does not seem possible to tell Xcode the resulting target might need
4040
# to be linked with C++ runtime. The project needs to have at least one C++
4141
# file. Add a dummy one.
42-
MYSQL_CREATE_EMPTY_FILE(mysql_client_test_embedded_dummy.cc)
42+
ADD_CUSTOM_COMMAND(OUTPUT
43+
${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
44+
COMMAND ${CMAKE_COMMAND} -E touch
45+
${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
46+
)
4347
ADD_EXECUTABLE(mysql_client_test_embedded
44-
mysql_client_test_embedded_dummy.cc
48+
${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
4549
../../tests/mysql_client_test.c)
4650
ELSE()
4751
ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)

sql/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ IF(WIN32 OR HAVE_DLOPEN)
187187
SET_TARGET_PROPERTIES(udf_example PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
188188
ENDIF()
189189
TARGET_LINK_LIBRARIES(udf_example strings)
190+
ELSE()
191+
# udf_example is using safemutex exported by mysqld
192+
TARGET_LINK_LIBRARIES(udf_example mysqld)
190193
ENDIF()
191194
ENDIF()
192195

@@ -246,4 +249,4 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
246249
ELSE()
247250
# Not windows or cross compiling, just install an empty directory
248251
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql)
249-
ENDIF()
252+
ENDIF()

0 commit comments

Comments
 (0)