From: Kefu Chai Date: Sat, 1 Aug 2020 05:17:44 +0000 (+0800) Subject: cmake: do not check OFED_PREFIX anymore X-Git-Tag: v16.1.0~1533^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a7c8015c870bc379c4e18e95d290bbdea44a67c;p=ceph.git cmake: do not check OFED_PREFIX anymore OFED_PREFIX was added to compile with xio messenger for supporting RDMA using the Accelio and/or MLNX_OFED package. but xio messenger was removed in in cc9a9142fd41ee5c98792c6f6d2e5504 let remove the leftover in CMakeLists Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 452f0b0278e78..d6b12db147078 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,11 +76,6 @@ if(WIN32) add_definitions(-include winsock_wrapper.h) endif() -if(OFED_PREFIX) - include_directories(SYSTEM ${OFED_PREFIX}/include) - link_directories(${OFED_PREFIX}/lib) -endif() - if(FREEBSD) include_directories(SYSTEM /usr/local/include) link_directories(/usr/local/lib) diff --git a/README.md b/README.md index 686e1083bfaa5..13a1b57a515bd 100644 --- a/README.md +++ b/README.md @@ -93,8 +93,8 @@ defaulted to ON. To build without the RADOS Gateway: Another example below is building with debugging and alternate locations for a couple of external dependencies: - cmake -DLEVELDB_PREFIX="/opt/hyperleveldb" -DOFED_PREFIX="/opt/ofed" \ - -DCMAKE_INSTALL_PREFIX=/opt/accelio -DCMAKE_C_FLAGS="-O0 -g3 -gdwarf-4" \ + cmake -DLEVELDB_PREFIX="/opt/hyperleveldb" \ + -DCMAKE_INSTALL_PREFIX=/opt/ceph -DCMAKE_C_FLAGS="-O0 -g3 -gdwarf-4" \ .. To view an exhaustive list of -D options, you can invoke `cmake` with: