Commit 694cbb5f authored by Antony T Curtis's avatar Antony T Curtis

fix judy cmake case sensitivity

parent 946d4fc1
# - Try to find Judy
# Once done this will define
#
# JUDY_FOUND - system has Judy
# JUDY_INCLUDE_DIR - the Judy include directory
# JUDY_LIBRARIES - Link these to use Judy
# JUDY_DEFINITIONS - Compiler switches required for using Judy
# Judy_FOUND - system has Judy
# Judy_INCLUDE_DIR - the Judy include directory
# Judy_LIBRARIES - Link these to use Judy
# Judy_DEFINITIONS - Compiler switches required for using Judy
IF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
IF (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
SET(Judy_FIND_QUIETLY TRUE)
ENDIF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
ENDIF (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
FIND_PATH(JUDY_INCLUDE_DIR Judy.h)
FIND_LIBRARY(JUDY_LIBRARIES NAMES Judy)
FIND_PATH(Judy_INCLUDE_DIR Judy.h)
FIND_LIBRARY(Judy_LIBRARIES NAMES Judy)
IF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
SET(JUDY_FOUND TRUE)
ELSE (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
SET(JUDY_FOUND FALSE)
ENDIF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
IF (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
SET(Judy_FOUND TRUE)
ELSE (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
SET(Judy_FOUND FALSE)
ENDIF (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
IF (JUDY_FOUND)
IF (Judy)
IF (NOT Judy_FIND_QUIETLY)
MESSAGE(STATUS "Found libjudy: ${JUDY_LIBRARIES}")
MESSAGE(STATUS "Found libjudy: ${Judy_LIBRARIES}")
ENDIF (NOT Judy_FIND_QUIETLY)
ELSE (JUDY_FOUND)
ELSE (Judy_FOUND)
IF (Judy_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could NOT find libjudy")
ENDIF (Judy_FIND_REQUIRED)
ENDIF (JUDY_FOUND)
ENDIF (Judy_FOUND)
MARK_AS_ADVANCED(JUDY_INCLUDE_DIR JUDY_LIBRARIES)
MARK_AS_ADVANCED(Judy_INCLUDE_DIR Judy_LIBRARIES)
......@@ -6,8 +6,8 @@ IF(NOT Boost_FOUND)
ENDIF()
INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
FIND_PACKAGE(JUDY)
IF(NOT JUDY_FOUND)
FIND_PACKAGE(Judy)
IF(NOT Judy_FOUND)
MESSAGE(STATUS "Judy not found")
include(ExternalProject)
ExternalProject_Add(
......@@ -18,10 +18,10 @@ IF(NOT JUDY_FOUND)
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
SET(JUDY_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/Judy/src/obj/.libs/libJudy.a)
SET(JUDY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Judy/src)
SET(Judy_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/Judy/src/obj/.libs/libJudy.a)
SET(Judy_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Judy/src)
ENDIF()
INCLUDE_DIRECTORIES(${JUDY_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${Judy_INCLUDE_DIR})
IF(MSVC)
# lp:756966 OQGRAPH on Win64 does not compile
......@@ -58,7 +58,7 @@ IF(BOOST_OK)
oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc
STORAGE_ENGINE
MODULE_ONLY
LINK_LIBRARIES ${JUDY_LIBRARIES})
LINK_LIBRARIES ${Judy_LIBRARIES})
ELSE(BOOST_OK)
MESSAGE(STATUS "Requisites for OQGraph not met")
ENDIF(BOOST_OK)
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