diff options
Diffstat (limited to 'storage/connect/CMakeLists.txt')
| -rw-r--r-- | storage/connect/CMakeLists.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 9b0f555ad48..be64ca7163f 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -247,11 +247,8 @@ ENDIF(CONNECT_WITH_ODBC) # # JDBC and MongoDB Java Driver # -IF(APPLE) - OPTION(CONNECT_WITH_JDBC "Compile CONNECT storage engine without JDBC support" OFF) -ELSE() - OPTION(CONNECT_WITH_JDBC "Compile CONNECT storage engine with JDBC support" ON) -ENDIF() +OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON) +OPTION(CONNECT_WITH_JDBC "Compile CONNECT storage engine with JDBC support" ON) IF(CONNECT_WITH_JDBC) FIND_PACKAGE(Java 1.6) @@ -263,12 +260,9 @@ IF(CONNECT_WITH_JDBC) # SET(JDBC_LIBRARY ${JAVA_JVM_LIBRARY}) will be dynamically linked SET(CONNECT_SOURCES ${CONNECT_SOURCES} javaconn.cpp jdbconn.cpp tabjdbc.cpp - jmgoconn.cpp jmgfam.cpp mongo.cpp tabjmg.cpp jdbccat.h javaconn.h jdbconn.h tabjdbc.h - jmgoconn.h jmgfam.h mongo.h tabjmg.h JdbcInterface.java ApacheInterface.java MariadbInterface.java MysqlInterface.java OracleInterface.java PostgresqlInterface.java - Mongo2Interface.java Mongo3Interface.java JavaWrappers.jar) # TODO: Find how to compile and install the java wrapper classes # Find required libraries and include directories @@ -278,6 +272,13 @@ IF(CONNECT_WITH_JDBC) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/JavaWrappers.jar DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine) add_definitions(-DJDBC_SUPPORT) + IF(CONNECT_WITH_MONGO) + SET(CONNECT_SOURCES ${CONNECT_SOURCES} + jmgfam.cpp jmgoconn.cpp mongo.cpp tabjmg.cpp + jmgfam.h jmgoconn.h mongo.h tabjmg.h + Mongo2Interface.java Mongo3Interface.java) + add_definitions(-DMONGO_SUPPORT) + ENDIF() ELSE() SET(JDBC_LIBRARY "") ENDIF() @@ -299,8 +300,6 @@ ENDIF(CONNECT_WITH_ZIP) # MONGO C Driver (CMAKE NOT YET WORKING) # -#OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON) - #IF(CONNECT_WITH_MONGO) # IF(WIN32) # # Adding some typical places to search in @@ -311,17 +310,18 @@ ENDIF(CONNECT_WITH_ZIP) # C:/mongo-c-driver/lib # D:/mongo-c-driver/lib) # ENDIF(WIN32) -# FIND_PACKAGE(libmongoc) +# FIND_PACKAGE(libmongoc 1.7) # IF (MONGO_FOUND) # INCLUDE_DIRECTORIES(${MONGO_INCLUDE_DIR}) # SET(MONGO_LIBRARY ${MONGO_LIBRARIES}) # SET(CONNECT_SOURCES ${CONNECT_SOURCES} # cmgoconn.cpp cmgfam.cpp tabcmg.cpp # cmgoconn.h cmgfam.h tabcmg.h) +# add_definitions(-DCMGO_SUPPORT) # IF (NOT JAVA_FOUND AND JNI_FOUND) # SET(CONNECT_SOURCES ${CONNECT_SOURCES} mongo.cpp mongo.h) +# add_definitions(-DMONGO_SUPPORT) # ENDIF (NOT JAVA_FOUND AND JNI_FOUND) -# add_definitions(-DMONGO_SUPPORT) # ENDIF(MONGO_FOUND) #ENDIF(CONNECT_WITH_MONGO) |