1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Detect Boost installation and build OQGRAPH when possible. For now, disable oqgraph on x64 until

Browse Source 
LPBUG 756966 is solved.
This commit is contained in:
Vladislav Vaintroub 2011-04-10 22:48:28 -07:00
parent 7b82d39398
commit fcd29b7845
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/oqgraph/CMakeLists.txt
View File

@ -13,6 +13,13 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
FIND_PACKAGE(Boost)
IF(Boost_FOUND)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
SET(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIRS})
ENDIF()
INCLUDE (CheckCXXSourceCompiles) INCLUDE (CheckCXXSourceCompiles)
CHECK_CXX_SOURCE_COMPILES( CHECK_CXX_SOURCE_COMPILES(
"#include <boost/version.hpp> "#include <boost/version.hpp>
@ -22,7 +29,8 @@ CHECK_CXX_SOURCE_COMPILES(
#endif #endif
int main() { return 0; }" BOOST_OK) int main() { return 0; }" BOOST_OK)
IF(BOOST_OK) # Only compile OQGRAPH on 32 bit, 64 bit does not compile yet (LPBUG 756966)
IF(BOOST_OK AND CMAKE_SIZEOF_VOID_P EQUAL 4)
INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OQGRAPH /EHsc") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OQGRAPH /EHsc")