File tree 2 files changed +10
-3
lines changed
2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -39,9 +39,13 @@ IF(CMAKE_GENERATOR MATCHES "Xcode")
39
39
# It does not seem possible to tell Xcode the resulting target might need
40
40
# to be linked with C++ runtime. The project needs to have at least one C++
41
41
# 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
+ )
43
47
ADD_EXECUTABLE (mysql_client_test_embedded
44
- mysql_client_test_embedded_dummy.cc
48
+ ${CMAKE_CURRENT_BINARY_DIR} / mysql_client_test_embedded_dummy.cc
45
49
../../tests/mysql_client_test.c)
46
50
ELSE ()
47
51
ADD_EXECUTABLE (mysql_client_test_embedded ../../tests/mysql_client_test.c)
Original file line number Diff line number Diff line change @@ -187,6 +187,9 @@ IF(WIN32 OR HAVE_DLOPEN)
187
187
SET_TARGET_PROPERTIES (udf_example PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR} /udf_example.def" )
188
188
ENDIF ()
189
189
TARGET_LINK_LIBRARIES (udf_example strings )
190
+ ELSE ()
191
+ # udf_example is using safemutex exported by mysqld
192
+ TARGET_LINK_LIBRARIES (udf_example mysqld)
190
193
ENDIF ()
191
194
ENDIF ()
192
195
@@ -246,4 +249,4 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
246
249
ELSE ()
247
250
# Not windows or cross compiling, just install an empty directory
248
251
INSTALL (FILES ${DUMMY_FILE} DESTINATION data/mysql)
249
- ENDIF ()
252
+ ENDIF ()
You can’t perform that action at this time.
0 commit comments