Commit d47ac4d7 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix problems found by Joro (Xcode generator specific)

parent 360ee02d
...@@ -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)
......
...@@ -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()
...@@ -246,4 +249,4 @@ IF(WIN32 AND MYSQLD_EXECUTABLE) ...@@ -246,4 +249,4 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
ELSE() ELSE()
# Not windows or cross compiling, just install an empty directory # Not windows or cross compiling, just install an empty directory
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql) INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql)
ENDIF() ENDIF()
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment