Browse Source

HPCC-11319 System won't build without MySQL

Separate the flags for using the mysql repository and using the mysql plugin.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 years ago
parent
commit
10d6f9a1c8
1 changed files with 5 additions and 5 deletions
  1. 5 5
      cmake_modules/commonSetup.cmake

+ 5 - 5
cmake_modules/commonSetup.cmake

@@ -84,7 +84,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
 
   option(USE_OPTIONAL "Automatically disable requested features with missing dependencies" ON)
 
-  if ( USE_PYTHON OR USE_V8 OR USE_JNI OR USE_RINSIDE OR USE_SQLITE3)
+  if ( USE_PYTHON OR USE_V8 OR USE_JNI OR USE_RINSIDE OR USE_SQLITE3 OR USE_MYSQL)
       set( WITH_PLUGINS ON )
   endif()
 
@@ -623,16 +623,16 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         endif()
       endif(USE_OPENSSL)
 
-      if(USE_MYSQL)
+      if(USE_MYSQL_REPOSITORY)
         find_package(MYSQL)
         if (MYSQL_FOUND)
-          add_definitions (-D_USE_MYSQL)
+          add_definitions (-D_USE_MYSQL_REPOSITORY)
         else()
           message(FATAL_ERROR "MYSQL requested but package not found")
         endif()
       else()
-        add_definitions (-D_NO_MYSQL)
-      endif(USE_MYSQL)
+        add_definitions (-D_NO_MYSQL_REPOSITORY)
+      endif(USE_MYSQL_REPOSITORY)
 
       if(USE_APR)
         find_package(APR)