Commit 9292953d authored by Michael Widenius's avatar Michael Widenius

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
parent 08115a80
...@@ -1130,3 +1130,4 @@ libmysql_r/strings_def.h ...@@ -1130,3 +1130,4 @@ libmysql_r/strings_def.h
storage/maria/aria_log_control storage/maria/aria_log_control
scripts/mytop scripts/mytop
include/*.h.tmp include/*.h.tmp
cmd-line-utils/libedit/emacs.h
...@@ -113,7 +113,7 @@ ENDIF() ...@@ -113,7 +113,7 @@ ENDIF()
SET(LIBS SET(LIBS
dbug strings regex mysys vio ${DBUG_LIBRARY} strings regex mysys vio
${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${ZLIB_LIBRARY} ${SSL_LIBRARIES}
${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
${MYSQLD_STATIC_PLUGIN_LIBS} ${MYSQLD_STATIC_PLUGIN_LIBS}
......
...@@ -18,6 +18,7 @@ IF(BOOST_OK) ...@@ -18,6 +18,7 @@ IF(BOOST_OK)
ELSE(MSVC) ELSE(MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) 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}) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
ENDIF(MSVC) ENDIF(MSVC)
......
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