Commit fcd29b78 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

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

LPBUG 756966 is solved.
parent 7b82d393
...@@ -13,6 +13,13 @@ ...@@ -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>
...@@ -21,8 +28,9 @@ CHECK_CXX_SOURCE_COMPILES( ...@@ -21,8 +28,9 @@ CHECK_CXX_SOURCE_COMPILES(
#error oops #error oops
#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")
......
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