From: Kefu Chai Date: Fri, 22 Jul 2016 04:23:32 +0000 (+0800) Subject: cmake: do not include undefind paths X-Git-Tag: ses5-milestone5~300^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8553f3ab9fc537f646c1f91c4d366a108a4441d;p=ceph.git cmake: do not include undefind paths for example ``` include_directories(${LEVELDB_PREFIX}/include) ``` does not make sense if `LEVELDB_PREFIX` is not defined. Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c87ffc177d4..aeb59b49ad80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,22 +57,24 @@ endif(WITH_MANPAGE) include_directories( ${PROJECT_BINARY_DIR}/src/include - ${OFED_PREFIX}/include - ${LEVELDB_PREFIX}/include - ${PROJECT_SOURCE_DIR}/src -) - -link_directories( - ${OFED_PREFIX}/lib - ${LEVELDB_PREFIX}/lib -) + ${PROJECT_SOURCE_DIR}/src) + +if(LEVELDB_PREFIX) + include_directories(${LEVELDB_PREFIX}/include) + link_directories(${LEVELDB_PREFIX}/lib) +endif() + +if(OFED_PREFIX) + include_directories(${OFED_PREFIX}/include) + link_directories(${OFED_PREFIX}/lib) +endif() + if(FREEBSD) include_directories(/usr/local/include) link_directories(/usr/local/lib) list(APPEND CMAKE_REQUIRED_INCLUDES /usr/local/include) endif(FREEBSD) - #put all the libs and binaries in one place set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)