Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
bd395996
Commit
bd395996
authored
Aug 02, 2012
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix oqgraph on MSVC
parent
b69e8d46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
cmake/os/WindowsCache.cmake
cmake/os/WindowsCache.cmake
+3
-0
storage/oqgraph/CMakeLists.txt
storage/oqgraph/CMakeLists.txt
+7
-3
No files found.
cmake/os/WindowsCache.cmake
View file @
bd395996
...
...
@@ -364,4 +364,7 @@ SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "")
SET
(
HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL
""
)
SET
(
HAVE_VALGRIND 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
()
storage/oqgraph/CMakeLists.txt
View file @
bd395996
...
...
@@ -4,9 +4,13 @@ IF(NOT Boost_FOUND)
ENDIF
()
INCLUDE_DIRECTORIES
(
BEFORE
${
Boost_INCLUDE_DIRS
}
)
# lp:756966 OQGRAPH on Win64 does not compile
IF
(
MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8
)
SET
(
BOOST_OK 0
)
IF
(
MSVC
)
# lp:756966 OQGRAPH on Win64 does not compile
IF
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
SET
(
BOOST_OK 0
)
ELSE
()
SET
(
BOOST_OK 1
)
ENDIF
()
ELSE
()
# See if that works. On old gcc it'll fail because of -fno-rtti
CHECK_CXX_SOURCE_COMPILES
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment