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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
694cbb5f
Commit
694cbb5f
authored
Feb 14, 2013
by
Antony T Curtis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix judy cmake case sensitivity
parent
946d4fc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
24 deletions
+24
-24
cmake/FindJudy.cmake
cmake/FindJudy.cmake
+18
-18
storage/oqgraph/CMakeLists.txt
storage/oqgraph/CMakeLists.txt
+6
-6
No files found.
cmake/FindJudy.cmake
View file @
694cbb5f
# - Try to find Judy
# - Try to find Judy
# Once done this will define
# Once done this will define
#
#
# J
UDY
_FOUND - system has Judy
# J
udy
_FOUND - system has Judy
# J
UDY
_INCLUDE_DIR - the Judy include directory
# J
udy
_INCLUDE_DIR - the Judy include directory
# J
UDY
_LIBRARIES - Link these to use Judy
# J
udy
_LIBRARIES - Link these to use Judy
# J
UDY
_DEFINITIONS - Compiler switches required for using Judy
# J
udy
_DEFINITIONS - Compiler switches required for using Judy
IF
(
J
UDY_INCLUDE_DIR AND JUDY
_LIBRARIES
)
IF
(
J
udy_INCLUDE_DIR AND Judy
_LIBRARIES
)
SET
(
Judy_FIND_QUIETLY TRUE
)
SET
(
Judy_FIND_QUIETLY TRUE
)
ENDIF
(
J
UDY_INCLUDE_DIR AND JUDY
_LIBRARIES
)
ENDIF
(
J
udy_INCLUDE_DIR AND Judy
_LIBRARIES
)
FIND_PATH
(
J
UDY
_INCLUDE_DIR Judy.h
)
FIND_PATH
(
J
udy
_INCLUDE_DIR Judy.h
)
FIND_LIBRARY
(
J
UDY
_LIBRARIES NAMES Judy
)
FIND_LIBRARY
(
J
udy
_LIBRARIES NAMES Judy
)
IF
(
J
UDY_INCLUDE_DIR AND JUDY
_LIBRARIES
)
IF
(
J
udy_INCLUDE_DIR AND Judy
_LIBRARIES
)
SET
(
J
UDY
_FOUND TRUE
)
SET
(
J
udy
_FOUND TRUE
)
ELSE
(
J
UDY_INCLUDE_DIR AND JUDY
_LIBRARIES
)
ELSE
(
J
udy_INCLUDE_DIR AND Judy
_LIBRARIES
)
SET
(
J
UDY
_FOUND FALSE
)
SET
(
J
udy
_FOUND FALSE
)
ENDIF
(
J
UDY_INCLUDE_DIR AND JUDY
_LIBRARIES
)
ENDIF
(
J
udy_INCLUDE_DIR AND Judy
_LIBRARIES
)
IF
(
J
UDY_FOUND
)
IF
(
J
udy
)
IF
(
NOT Judy_FIND_QUIETLY
)
IF
(
NOT Judy_FIND_QUIETLY
)
MESSAGE
(
STATUS
"Found libjudy:
${
J
UDY
_LIBRARIES
}
"
)
MESSAGE
(
STATUS
"Found libjudy:
${
J
udy
_LIBRARIES
}
"
)
ENDIF
(
NOT Judy_FIND_QUIETLY
)
ENDIF
(
NOT Judy_FIND_QUIETLY
)
ELSE
(
J
UDY
_FOUND
)
ELSE
(
J
udy
_FOUND
)
IF
(
Judy_FIND_REQUIRED
)
IF
(
Judy_FIND_REQUIRED
)
MESSAGE
(
FATAL_ERROR
"Could NOT find libjudy"
)
MESSAGE
(
FATAL_ERROR
"Could NOT find libjudy"
)
ENDIF
(
Judy_FIND_REQUIRED
)
ENDIF
(
Judy_FIND_REQUIRED
)
ENDIF
(
J
UDY
_FOUND
)
ENDIF
(
J
udy
_FOUND
)
MARK_AS_ADVANCED
(
J
UDY_INCLUDE_DIR JUDY
_LIBRARIES
)
MARK_AS_ADVANCED
(
J
udy_INCLUDE_DIR Judy
_LIBRARIES
)
storage/oqgraph/CMakeLists.txt
View file @
694cbb5f
...
@@ -6,8 +6,8 @@ IF(NOT Boost_FOUND)
...
@@ -6,8 +6,8 @@ IF(NOT Boost_FOUND)
ENDIF
()
ENDIF
()
INCLUDE_DIRECTORIES
(
BEFORE
${
Boost_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
BEFORE
${
Boost_INCLUDE_DIRS
}
)
FIND_PACKAGE
(
J
UDY
)
FIND_PACKAGE
(
J
udy
)
IF
(
NOT J
UDY
_FOUND
)
IF
(
NOT J
udy
_FOUND
)
MESSAGE
(
STATUS
"Judy not found"
)
MESSAGE
(
STATUS
"Judy not found"
)
include
(
ExternalProject
)
include
(
ExternalProject
)
ExternalProject_Add
(
ExternalProject_Add
(
...
@@ -18,10 +18,10 @@ IF(NOT JUDY_FOUND)
...
@@ -18,10 +18,10 @@ IF(NOT JUDY_FOUND)
INSTALL_COMMAND
""
INSTALL_COMMAND
""
BUILD_IN_SOURCE 1
BUILD_IN_SOURCE 1
)
)
SET
(
J
UDY
_LIBRARIES
${
CMAKE_CURRENT_SOURCE_DIR
}
/Judy/src/obj/.libs/libJudy.a
)
SET
(
J
udy
_LIBRARIES
${
CMAKE_CURRENT_SOURCE_DIR
}
/Judy/src/obj/.libs/libJudy.a
)
SET
(
J
UDY
_INCLUDE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/Judy/src
)
SET
(
J
udy
_INCLUDE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/Judy/src
)
ENDIF
()
ENDIF
()
INCLUDE_DIRECTORIES
(
${
J
UDY
_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
J
udy
_INCLUDE_DIR
}
)
IF
(
MSVC
)
IF
(
MSVC
)
# lp:756966 OQGRAPH on Win64 does not compile
# lp:756966 OQGRAPH on Win64 does not compile
...
@@ -58,7 +58,7 @@ IF(BOOST_OK)
...
@@ -58,7 +58,7 @@ IF(BOOST_OK)
oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc
oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc
STORAGE_ENGINE
STORAGE_ENGINE
MODULE_ONLY
MODULE_ONLY
LINK_LIBRARIES
${
J
UDY
_LIBRARIES
}
)
LINK_LIBRARIES
${
J
udy
_LIBRARIES
}
)
ELSE
(
BOOST_OK
)
ELSE
(
BOOST_OK
)
MESSAGE
(
STATUS
"Requisites for OQGraph not met"
)
MESSAGE
(
STATUS
"Requisites for OQGraph not met"
)
ENDIF
(
BOOST_OK
)
ENDIF
(
BOOST_OK
)
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