瀏覽代碼

HPCC-16522 Couchbase plugin build fix and moved USE_OPTIONAL

Signed-off-by: Michael Gardner <michael.gardner@lexisnexis.com>
Michael Gardner 8 年之前
父節點
當前提交
cce05d7468
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 0
      cmake_modules/FindCOUCHBASE.cmake
  2. 1 1
      cmake_modules/commonSetup.cmake

+ 1 - 0
cmake_modules/FindCOUCHBASE.cmake

@@ -37,6 +37,7 @@ IF (NOT LIBCOUCHBASE_FOUND)
    FIND_LIBRARY (
      LIBCOUCHBASE_LIBRARIES
      NAMES couchbase libcouchbase
+     PATHS /usr/lib64
      PATH_SUFFIXES libcouchbase
    )
 

+ 1 - 1
cmake_modules/commonSetup.cmake

@@ -94,6 +94,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   option(USE_SIGNED_CHAR "Build system with default char type is signed" OFF)
   option(USE_UNSIGNED_CHAR "Build system with default char type is unsigned" OFF)
   option(USE_MYSQL "Enable mysql support" ON)
+  option(USE_OPTIONAL "Automatically disable requested features with missing dependencies" ON)
   # Generates code that is more efficient, but will cause problems if target platforms do not support it.
   if (CMAKE_SIZEOF_VOID_P EQUAL 8)
     option(USE_INLINE_TSC "Inline calls to read TSC (time stamp counter)" ON)
@@ -162,7 +163,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         endif()
     endforeach()
     #"cmake -DEXAMPLEPLUGIN=ON <path-to/HPCC-Platform/>" will configure the plugin makefiles to be built with "make".
-    option(USE_OPTIONAL "Automatically disable requested features with missing dependencies" ON)
 
   if (SIGN_MODULES)
       message(STATUS "GPG signing check")