mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix build errors

Browse source
This commit is contained in:
Vladislav Vaintroub 2009-12-01 18:28:13 +00:00
commit 1407b6f1ec
4 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmake/dtrace.cmake
View file

@ -86,7 +86,13 @@ MACRO (DTRACE_INSTRUMENT target)
-P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
WORKING_DIRECTORY ${objdir}
)
SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}")
GET_TARGET_PROPERTY(target_link_flags ${target} LINK_FLAGS)
IF(NOT target_link_flags)
SET(target_link_flags)
ENDIF()
SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS
"${target_link_flags} ${outfile}")
ENDIF()
ENDIF()
ENDMACRO()

6
mysys/CMakeLists.txt
View file

@ -48,10 +48,10 @@ IF(CMAKE_COMPILER_IS_GNUCC AND NOT HAVE_CXX_NEW)
ADD_DEFINITIONS( -DUSE_MYSYS_NEW)
ENDIF()
IF(CMAKE_C_COMPILER MATCHES SunPro)
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
# Inline assembly template for rdtsc
SET_SOURCE_FILE_PROPERTIES(my_rdtsc.c
PROPERTIES COMPILE_FLAGS ${CMAKE_CURRENT_SOURCE_DIR}/my_timer_cycles.il)
SET_SOURCE_FILES_PROPERTIES(my_rdtsc.c
PROPERTIES COMPILE_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/my_timer_cycles.il")
ENDIF()
IF(HAVE_LARGE_PAGES)

12
plugin/semisync/CMakeLists.txt
View file

@ -15,11 +15,15 @@
SET(SEMISYNC_MASTER_SOURCES semisync.cc semisync_master.cc semisync_master_plugin.cc
SET(SEMISYNC_MASTER_SOURCES
semisync.cc semisync_master.cc semisync_master_plugin.cc
semisync.h semisync_master.h)
MYSQL_ADD_PLUGIN(semisync_master ${SEMISYNC_MASTER_SOURCES} MODULE_ONLY MODULE_OUTPUT_NAME "semisync_master")
MYSQL_ADD_PLUGIN(semisync_master ${SEMISYNC_MASTER_SOURCES}
MODULE_ONLY MODULE_OUTPUT_NAME "semisync_master")
SET(SEMISYNC_SLAVE_SOURCES semisync.cc semisync_slave.cc semisync_slave_plugin.cc semisync.h semisync_slave.h )
MYSQL_ADD_PLUGIN(semisync_slave ${SEMISYNC_MASTER_SOURCES} MODULE_ONLY MODULE_OUTPUT_NAME "semisync_slave")
SET(SEMISYNC_SLAVE_SOURCES semisync.cc semisync_slave.cc
semisync_slave_plugin.cc semisync.h semisync_slave.h )
MYSQL_ADD_PLUGIN(semisync_slave ${SEMISYNC_SLAVE_SOURCES}
MODULE_ONLY MODULE_OUTPUT_NAME "semisync_slave")

6
sql/CMakeLists.txt
View file

@ -96,8 +96,7 @@ IF(MSVC)
OUTPUT mysqld_dummy.cc
COMMAND cmake ARGS -E touch mysqld_dummy.cc
VERBATIM)
SET(MYSQLD_CORE_LIBS ${MYSQLD_CORE_LIBS} sql)
SET(SQL_LIB sql)
ELSE()
ADD_EXECUTABLE(mysqld ${SQL_SOURCE})
DTRACE_INSTRUMENT(mysqld)
@ -129,7 +128,8 @@ ENDIF()
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})
TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_STATIC_PLUGIN_LIBS} sql mysys dbug strings vio regex ${MYSQLD_CORE_LIBS}
TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_STATIC_PLUGIN_LIBS}
mysys dbug strings vio regex ${SQL_LIB}
${LIBWRAP_LIBRARY} ${ZLIB_LIBRARY} ${SSL_LIBRARIES})
INSTALL(TARGETS mysqld DESTINATION bin)
INSTALL_DEBUG_SYMBOLS(mysqld)