Readded GFlags to dependencies and changed Find cmake file (d46b430a) · Commits · David Auer / gekkofs

ifs/CMake/FindGFlags.cmake

+40 −83

Original line number	Diff line number	Diff line
		# - Try to find GFlags
		#
		# The following variables are optionally searched for defaults
		# GFlags_ROOT_DIR: Base directory where all GFlags components are found
		#
		# The following are set after configuration is done:
		# GFlags_FOUND
		# GFlags_INCLUDE_DIRS
		# GFlags_LIBS
		# GFlags_LIBRARY_DIRS
		cmake_minimum_required(VERSION 2.6)
		cmake_policy(SET CMP0011 OLD)

		set(GFlags_ROOT_DIR)
		if (WIN32)
		FIND_PATH(GFlags_ROOT_DIR
		src/gflags.cc
		HINTS
		$ENV{GFLAGS_ROOT})
		else (WIN32)
		FIND_PATH(GFlags_ROOT_DIR
		libgflags.dylib
		find_path(GFlags_DIR
		HINTS
		/usr/local/lib
		/usr
		/usr/local
		/usr/local/adafs/
		$ENV{HOME}/adafs/install
		)
		endif (WIN32)

		if (UNIX)
		FIND_PATH(GFlags_ROOT_DIR
		libgflags.so
		find_path(GFlags_INCLUDE_DIR gflags.h
		HINTS
		$ENV{HOME}/adafs/install
		PATH_SUFFIXES lib
		PATH_SUFFIXES lib64
		/usr/local/lib
		${GFlags_DIR}
		$ENV{HOME}/opt
		/usr
		/usr/local
		/usr/local/adafs
		/opt
		PATH_SUFFIXES include
		PATH_SUFFIXES include/gflags
		)
		endif (UNIX)

		IF (GFlags_ROOT_DIR)
		# We are testing only a couple of files in the include directories
		if (WIN32)
		FIND_PATH(GFlags_INCLUDE_DIRS
		gflags/gflags.h
		HINTS
		${GFlags_ROOT_DIR}/src/windows
		)
		else (WIN32)
		FIND_PATH(GFlags_INCLUDE_DIRS
		gflags/gflags.h
		find_library(GFlags_LIBRARY gflags
		HINTS
		/usr/local/include
		${GFlags_ROOT_DIR}/src
		$ENV{HOME}/adafs/install
		${GFlags_DIR}
		$ENV{HOME}/opt
		/usr
		/usr/local
		/usr/local/adafs
		/opt/
		PATH_SUFFIXES lib
		PATH_SUFFIXES lib/gflags
		)
		endif (WIN32)

		# Find the libraries
		SET(GFlags_LIBRARY_DIRS ${GFlags_ROOT_DIR})
		set(GFlags_INCLUDE_DIRS ${GFlags_INCLUDE_DIR})
		set(GFlags_LIBRARIES ${GFlags_LIBRARY})

		# TODO: This can use some per-component linking
		if (MSVC)
		SET(_gflags_libpath_suffixes /Release /Debug)
		FIND_LIBRARY(GFlags_lib_release
		NAMES libgflags
		HINTS
		${GFlags_LIBRARY_DIRS}
		PATH_SUFFIXES ${_gflags_libpath_suffixes})
		FIND_LIBRARY(GFlags_lib_debug
		NAMES libgflags-debug
		HINTS
		${GFlags_LIBRARY_DIRS}
		PATH_SUFFIXES ${_gflags_libpath_suffixes})
		SET(GFlags_lib optimized ${GFlags_lib_release} debug ${GFlags_lib_debug})
		else ()
		FIND_LIBRARY(GFlags_lib gflags ${GFlags_LIBRARY_DIRS})
		endif ()

		# set up include and link directory
		include_directories(${GFlags_INCLUDE_DIRS})
		link_directories(${GFlags_LIBRARY_DIRS})
		message(STATUS "gflags library found at ${GFlags_lib}")
		SET(GFlags_LIBS ${GFlags_lib})
		SET(GFlags_FOUND true)
		MARK_AS_ADVANCED(GFlags_INCLUDE_DIRS)
		ELSE (GFlags_ROOT_DIR)
		FIND_PATH(GFlags_ROOT_DIR src)
		MARK_AS_ADVANCED(GFlags_ROOT_DIR)
		MESSAGE(STATUS "Cannot find Root directory of gflags")
		SET(GFlags_FOUND false)
		ENDIF (GFlags_ROOT_DIR)
		include(FindPackageHandleStandardArgs)
		find_package_handle_standard_args(GFlags DEFAULT_MSG GFlags_LIBRARY GFlags_INCLUDE_DIR)

		mark_as_advanced(
		GFlags_DIR
		GFlags_LIBRARY
		GFlags_INCLUDE_DIR
		)

ifs/CMakeLists.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
		find_package(LZ4 REQUIRED)
		find_package(ZLIB REQUIRED)
		find_package(BZip2 REQUIRED)
		find_package(GFlags REQUIRED)
		find_package(snappy REQUIRED)
		find_package(ZStd REQUIRED)
		find_package(RocksDB REQUIRED)
		@@ -107,7 +108,7 @@ set(SOURCE_FILES main.cpp main.hpp configure.hpp util.cpp
		add_executable(adafs_daemon ${SOURCE_FILES})
		target_link_libraries(adafs_daemon ${ROCKSDB_LIBRARIES}
		# rocksdb libs
		${snappy_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${ZSTD_LIBRARIES} ${LZ4_LIBRARY}
		${snappy_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${ZSTD_LIBRARIES} ${LZ4_LIBRARY} ${gflags_LIBRARIES}
		# margo libs
		${NA_LIB} ${MERCURY_LIBRARIES} ${MERCURY_UTIL_LIBRARIES} ${ABT_LIBRARIES} ${ABT_SNOOZER_LIBRARIES} ${MARGO_LIBRARIES}
		-lpthread -lboost_system -lboost_filesystem -lboost_serialization -lboost_program_options -pg)

ifs/scripts/clone_dep.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ if [ "$CLUSTER" == "mogon1" ]; then
		# get libev for mercury
		wgetdeps "libev" "http://dist.schmorp.de/libev/libev-4.24.tar.gz"
		# get gflags for rocksdb
		#wgetdeps "gflags" "https://github.com/gflags/gflags/archive/v2.2.1.tar.gz"
		wgetdeps "gflags" "https://github.com/gflags/gflags/archive/v2.2.1.tar.gz"
		# get zstd for fast compression in rocksdb
		wgetdeps "zstd" "https://github.com/facebook/zstd/archive/v1.3.2.tar.gz"
		# get zlib for rocksdb

ifs/scripts/compile_dep.sh

+7 −7

Original line number	Diff line number	Diff line
		@@ -89,13 +89,13 @@ if [ "$CLUSTER" == "mogon1" ]; then
		make -j$CORES \|\| exit 1
		make install \|\| exit 1
		# compile gflags
		# echo "############################################################ Installing: gflags"
		# CURR=$GIT/gflags
		# prepare_build_dir $CURR
		# cd $CURR/build
		# cmake -DCMAKE_INSTALL_PREFIX=$INSTALL -DCMAKE_BUILD_TYPE:STRING=Release .. \|\| exit 1
		# make -j$CORES \|\| exit 1
		# make install \|\| exit 1
		echo "############################################################ Installing: gflags"
		CURR=$GIT/gflags
		prepare_build_dir $CURR
		cd $CURR/build
		cmake -DCMAKE_INSTALL_PREFIX=$INSTALL -DCMAKE_BUILD_TYPE:STRING=Release .. \|\| exit 1
		make -j$CORES \|\| exit 1
		make install \|\| exit 1
		# compile zstd
		echo "############################################################ Installing: zstd"
		CURR=$GIT/zstd/build/cmake