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

fix oqgraph on MSVC

Browse Source
This commit is contained in:
Vladislav Vaintroub 2012-08-02 23:17:27 +02:00
parent b69e8d46b6
commit bd39599668
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/os/WindowsCache.cmake
View File

@ -364,4 +364,7 @@ SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "")
SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "") SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "")
SET(HAVE_VALGRIND CACHE INTERNAL "") SET(HAVE_VALGRIND CACHE INTERNAL "")
SET(HAVE_EVENT_H CACHE INTERNAL "") SET(HAVE_EVENT_H CACHE INTERNAL "")
SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "")
SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "")
SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
ENDIF() ENDIF()

10
storage/oqgraph/CMakeLists.txt
View File

@ -4,9 +4,13 @@ IF(NOT Boost_FOUND)
ENDIF() ENDIF()
INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
# lp:756966 OQGRAPH on Win64 does not compile IF(MSVC)
IF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) # lp:756966 OQGRAPH on Win64 does not compile
SET(BOOST_OK 0) IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(BOOST_OK 0)
ELSE()
SET(BOOST_OK 1)
ENDIF()
ELSE() ELSE()
# See if that works. On old gcc it'll fail because of -fno-rtti # See if that works. On old gcc it'll fail because of -fno-rtti
CHECK_CXX_SOURCE_COMPILES( CHECK_CXX_SOURCE_COMPILES(