Browse Source

Fixed that oqgraph and libmysqld/examples compiles on OpenSuse 11.4

.bzrignore:
  Ignore generated file emacs.h
libmysqld/CMakeLists.txt:
  Remove direct usage of 'dbug' library
  This fixes that 'BUILD/compile-dist' works
storage/oqgraph/CMakeLists.txt:
  Remove compiler option '-fno-rtti' as BOOST requires this
pull/374/head
Michael Widenius 14 years ago
parent
commit
9292953d5a
  1. 1
      .bzrignore
  2. 2
      libmysqld/CMakeLists.txt
  3. 1
      storage/oqgraph/CMakeLists.txt

1
.bzrignore

@ -1130,3 +1130,4 @@ libmysql_r/strings_def.h
storage/maria/aria_log_control
scripts/mytop
include/*.h.tmp
cmd-line-utils/libedit/emacs.h

2
libmysqld/CMakeLists.txt

@ -113,7 +113,7 @@ ENDIF()
SET(LIBS
dbug strings regex mysys vio
${DBUG_LIBRARY} strings regex mysys vio
${ZLIB_LIBRARY} ${SSL_LIBRARIES}
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
${MYSQLD_STATIC_PLUGIN_LIBS}

1
storage/oqgraph/CMakeLists.txt

@ -18,6 +18,7 @@ IF(BOOST_OK)
ELSE(MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-rtti" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
ENDIF(MSVC)

Loading…
Cancel
Save