daos: remove WITH_CART_PREFIX build option (#502)

The WITH_CART_PREFIX build option was added when the
DAOS and CART libraries were built under seperate paths
by DAOS. The libraries are now built under the same
path so this build variable is no longer necessary.

Signed-off-by: Danielle Sikich <danielle.sikich@intel.com>

CMakeLists.txt

@@ -105,14 +105,11 @@ ENDIF(ENABLE_HDF5)
 OPTION(ENABLE_DAOS "Enable DAOS support")
 IF(ENABLE_DAOS)
   SET(CMAKE_EXE_LINKER_FLAGS -luuid)
-  FIND_PACKAGE(CART REQUIRED)
-  INCLUDE_DIRECTORIES(${CART_INCLUDE_DIRS})
-  message(${CART_INCLUDE_DIRS})
-  LIST(APPEND MFU_EXTERNAL_LIBS ${CART_LIBRARIES})
-  LIST(APPEND MFU_EXTERNAL_LIBS ${GURT_LIBRARIES})
   FIND_PACKAGE(DAOS REQUIRED)
   INCLUDE_DIRECTORIES(${DAOS_INCLUDE_DIRS})
   LIST(APPEND MFU_EXTERNAL_LIBS ${DAOS_LIBRARIES})
+  LIST(APPEND MFU_EXTERNAL_LIBS ${GURT_LIBRARIES})
+  LIST(APPEND MFU_EXTERNAL_LIBS ${CART_LIBRARIES})
   LIST(APPEND MFU_EXTERNAL_LIBS ${DUNS_LIBRARIES})
   LIST(APPEND MFU_EXTERNAL_LIBS ${DFS_LIBRARIES})
   LIST(APPEND MFU_EXTERNAL_LIBS ${DAOS_COMMON_LIBRARIES})

cmake/FindDAOS.cmake

@@ -3,6 +3,8 @@
 #  daos_FOUND - System has libdaos
 #  daos_INCLUDE_DIRS - daos.h
 #  daos_LIBRARIES - libdaos
+#  GURT_LIBRARIES - libgurt
+#  CART_LIBRARIES - libcart
 #  DUNS_LIBRARIES - libduns 
 #  DFS_LIBRARIES - libdfs 
 #  COMMON_LIBRARIES - libdaos_common
@@ -16,6 +18,16 @@ FIND_LIBRARY(DAOS_LIBRARIES
     HINTS ${WITH_DAOS_PREFIX}/lib
 )
 
+FIND_LIBRARY(GURT_LIBRARIES
+    NAMES gurt 
+    HINTS ${WITH_DAOS_PREFIX}/lib
+)
+
+FIND_LIBRARY(CART_LIBRARIES
+    NAMES cart 
+    HINTS ${WITH_DAOS_PREFIX}/lib
+)
+
 FIND_LIBRARY(DUNS_LIBRARIES
     NAMES duns
     HINTS ${WITH_DAOS_PREFIX}/lib
@@ -39,6 +51,8 @@ FIND_PATH(DAOS_INCLUDE_DIRS
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(DAOS DEFAULT_MSG
     DAOS_LIBRARIES
+    CART_LIBRARIES
+    GURT_LIBRARIES
     DUNS_LIBRARIES
     DFS_LIBRARIES
     COMMON_LIBRARIES
@@ -48,6 +62,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(DAOS DEFAULT_MSG
 # Hide these vars from ccmake GUI
 MARK_AS_ADVANCED(
         DAOS_LIBRARIES
+        CART_LIBRARIES
+        GURT_LIBRARIES
         DUNS_LIBRARIES
         DFS_LIBRARIES
         COMMON_LIBRARIES

doc/rst/build.rst

@@ -125,8 +125,8 @@ Build everything directly with DAOS support
 -------------------------------------------
 
 To build with DAOS support, first install the dependenies as mentioned above,
-and make sure DAOS is installed. If CART and DAOS are installed under a standard
-system path then specifying the CART and DAOS paths is unnecessary.
+and make sure DAOS is installed. If DAOS is installed under a standard
+system path then specifying the DAOS path is unnecessary.
 
 .. code-block:: Bash
 
@@ -137,7 +137,6 @@ system path then specifying the CART and DAOS paths is unnecessary.
      -DWITH_DTCMP_PREFIX=../install \
      -DWITH_LibCircle_PREFIX=../install \
      -DCMAKE_INSTALL_PREFIX=../install \
-     -DWITH_CART_PREFIX=</path/to/daos/> \
      -DWITH_DAOS_PREFIX=</path/to/daos/> \
      -DENABLE_DAOS=ON
    make install

man/mpifileutils.1

@@ -352,7 +352,6 @@ cmake ../mpifileutils \e
   \-DWITH_DTCMP_PREFIX=../install \e
   \-DWITH_LibCircle_PREFIX=../install \e
   \-DCMAKE_INSTALL_PREFIX=../install \e
-  \-DWITH_CART_PREFIX=</path/to/daos/> \e
   \-DWITH_DAOS_PREFIX=</path/to/daos/> \e
   \-DENABLE_DAOS=ON
 make install
@@ -362,8 +361,7 @@ make install
 .UNINDENT
 .sp
 The above build with DAOS option also assumes you have already installed DAOS. If
-CART and DAOS are installed under a standard system path then specifying the CART
-and DAOS paths is unnecessary.
+DAOS is installed under a standard system path then specifying the DAOS path is unnecessary.
 .sp
 To enable Lustre, GPFS, and experimental tools, add the following flags during CMake:
 .INDENT 0.0