constcast
/
vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly check for mongodb version 

In CMake scripts, do not skip the check for mongodb even if
library and include directories are already cached.

Signed-off-by: Luca Bruno <lucab@debian.org>
master
Luca Bruno 2012-07-17 14:45:32 +02:00
parent e1408e92f2
commit 1c0e44a3ee
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -105,7 +105,6 @@ IF (SUPPORT_MONGO)
ENDIF (NOT MONGO_FOUND)
ENDIF (SUPPORT_MONGO)
IF (MONGO_FOUND)
MESSAGE(STATUS "Found MongoDB libraries")
ADD_DEFINITIONS(-DMONGO_SUPPORT_ENABLED)
### Mongo is currently forcing BOOST_FILE_SYSTEM v2 when its
### headers are included. If we use version v3 in the rest of
@ -118,6 +117,9 @@ IF (MONGO_FOUND)
IF (MONGO_VERSION_2)
ADD_DEFINITIONS(-DMONGO_VERSION_2)
MESSAGE(STATUS "Found MongoDB libraries (version 2)")
ELSE (MONGO_VERSION_2)
MESSAGE(STATUS "Found MongoDB libraries")
ENDIF (MONGO_VERSION_2)
INCLUDE_DIRECTORIES(${MONGO_INCLUDE_DIR})

12
cmake/modules/FindMONGO.cmake
View File

@ -39,18 +39,20 @@ else(MONGO_INCLUDE_DIR AND MONGO_LIBRARIES)
set(MONGO_FOUND FALSE)
message(STATUS "MongoDB not found.")
endif(MONGO_INCLUDE_DIR AND MONGO_LIBRARIES)
mark_as_advanced(MONGO_INCLUDE_DIR MONGO_LIBRARIES)
mark_as_advanced(MONGO_VERSION_CHECK)
endif(MONGO_INCLUDE_DIR AND MONGO_LIBRARIES)
if (MONGO_FOUND)
find_path(MONGO_VERSION_CHECK util/net/hostandport.h
/usr/include/mongo/
/usr/local/include/mongo/
/opt/local/include/mongo)
if (MONGO_VERSION_CHECK)
MESSAGE(STATUS "Found Mongo version 2")
set (MONGO_VERSION_2 TRUE)
endif(MONGO_VERSION_CHECK)
endif (MONGO_FOUND)
mark_as_advanced(MONGO_INCLUDE_DIR MONGO_LIBRARIES)
mark_as_advanced(MONGO_VERSION_CHECK)
endif(MONGO_INCLUDE_DIR AND MONGO_LIBRARIES)