Merge branch 'cmake_find_mercury' into dev (7924d746) · Commits · hpc / gekkofs

ifs/CMake/FindMercury.cmake

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		find_path(MERCURY_DIR
		HINTS
		/usr
		/usr/local
		/usr/local/adafs/
		${ADAFS_DEPS_INSTALL}
		)

		find_path(MERCURY_INCLUDE_DIR mercury.h
		HINTS
		${ADAFS_DEPS_INSTALL}
		${MERCURY_DIR}
		/usr
		/usr/local
		/usr/local/adafs
		/opt
		PATH_SUFFIXES include
		PATH_SUFFIXES include/mercury
		)

		find_library(MERCURY_LIBRARY
		NAMES mercury mercury_debug
		HINTS
		${ADAFS_DEPS_INSTALL}
		${MERCURY_DIR}
		$ENV{HOME}/opt
		/usr
		/usr/local
		/usr/local/adafs
		/opt/
		PATH_SUFFIXES lib
		PATH_SUFFIXES lib/mercury
		)

		set(MERCURY_INCLUDE_DIRS ${MERCURY_INCLUDE_DIR})
		set(MERCURY_LIBRARIES ${MERCURY_LIBRARY})


		include(FindPackageHandleStandardArgs)
		find_package_handle_standard_args(Mercury DEFAULT_MSG MERCURY_LIBRARY MERCURY_INCLUDE_DIR)

		mark_as_advanced(
		MERCURY_DIR
		MERCURY_LIBRARY
		MERCURY_INCLUDE_DIR
		)
		No newline at end of file

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		find_path(MERCURY_UTIL_DIR
		HINTS
		/usr
		/usr/local
		/usr/local/adafs/
		${ADAFS_DEPS_INSTALL}
		)

		find_library(MERCURY_UTIL_LIBRARY
		NAMES mercury_util mercury_util_debug
		HINTS
		${ADAFS_DEPS_INSTALL}
		${MERCURY_UTIL_DIR}
		$ENV{HOME}/opt
		/usr
		/usr/local
		/usr/local/adafs
		/opt/
		PATH_SUFFIXES lib
		PATH_SUFFIXES lib/mercury_util
		)

		set(MERCURY_UTIL_LIBRARIES ${MERCURY_UTIL_LIBRARY})


		include(FindPackageHandleStandardArgs)
		find_package_handle_standard_args(Mercury_Util DEFAULT_MSG MERCURY_UTIL_LIBRARY)

		mark_as_advanced(
		MERCURY_UTIL_DIR
		MERCURY_UTIL_LIBRARY
		MERCURY_UTIL_INCLUDE_DIR
		)
		No newline at end of file

+27 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ find_package(RocksDB REQUIRED)
		# margo dependencies
		find_package(Libev REQUIRED)
		find_package(Mercury REQUIRED)
		find_package(MercuryUtil REQUIRED)
		find_package(Abt REQUIRED)
		find_package(Abt-Snoozer REQUIRED)
		find_package(Margo REQUIRED)
		@@ -114,6 +113,33 @@ if (NOT USE_OFI_VERBS AND NOT USE_OFI_PSM2 AND NOT USE_CCI AND NOT USE_BMI)
		add_definitions(-DRPC_PROTOCOL="bmi+tcp")
		endif()


		# Imported target
		add_library(RocksDB INTERFACE IMPORTED GLOBAL)
		target_link_libraries(RocksDB
		INTERFACE
		${ROCKSDB_LIBRARIES}
		# rocksdb libs
		${snappy_LIBRARIES}
		${ZLIB_LIBRARIES}
		${BZIP2_LIBRARIES}
		${ZSTD_LIBRARIES}
		${LZ4_LIBRARY}
		)

		if(${JeMalloc_FOUND})
		target_link_libraries(RocksDB
		INTERFACE
		${JEMALLOC_LIBRARIES}
		)
		endif()
		# we cannot use target_include_directories with CMake < 3.11
		set_target_properties(RocksDB
		PROPERTIES
		INTERFACE_INCLUDE_DIRECTORIES ${ROCKSDB_INCLUDE_DIRS}
		)


		set(INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")

		# define include directories that are relevant for all targets

+2 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,8 @@ extern void* libc_opendir;
		extern void* libc_readdir;
		extern void* libc_closedir;

		extern void* libc_chdir;

		void init_passthrough_if_needed();

		#endif //IFS_PASSTHROUGH_HPP

+2 −5

Original line number	Diff line number	Diff line
		@@ -38,13 +38,11 @@ target_link_libraries(adafs_daemon
		# margo libs
		${ABT_LIBRARIES}
		${ABT_SNOOZER_LIBRARIES}
		${NA_LIB}
		${MERCURY_LIBRARIES}
		${MERCURY_UTIL_LIBRARIES}
		mercury
		${MARGO_LIBRARIES}
		# others
		Boost::program_options
		Boost::filesystem
		${JEMALLOC_LIBRARIES}
		Threads::Threads
		)

		@@ -53,6 +51,5 @@ target_include_directories(adafs_daemon
		${ABT_INCLUDE_DIRS}
		${ABT_SNOOZER_INCLUDE_DIRS}
		${LIBEV_INCLUDE_DIRS}
		${MERCURY_INCLUDE_DIRS}
		${MARGO_INCLUDE_DIRS}
		)