Commit 92147d9e authored by Steven Murray's avatar Steven Murray
Browse files

Added some more cmake find modules

parent 91c4bb16
......@@ -126,7 +126,7 @@ cta::catalogue::ColumnNameToIdx cta::catalogue::SqliteStmt::getColumnNameToIdx()
} catch(exception::Exception &ne) {
exception::Exception ex;
ex.getMessage() << __FUNCTION__ << " failed: For SQL statement " << m_sql
<< ": " << ne.getMessage();
<< ": " << ne.getMessage().str();
throw ex;
}
......
# The CERN Tape Archive(CTA) project
# Copyright(C) 2015 CERN
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This module will set the following variables:
# BINUTILS_FOUND
# BINUTILS_INCLUDE_DIRS
# BINUTILS_LIBRARIES
find_path(BINUTILS_INCLUDE_DIRS
bfd.h
PATHS /usr/include
NO_DEFAULT_PATH)
find_library(BINUTILS_LIBRARIES
NAME bfd
PATHS /usr/lib64
NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(binutils DEFAULT_MSG
BINUTILS_INCLUDE_DIRS BINUTILS_LIBRARIES)
# The CERN Tape Archive(CTA) project
# Copyright(C) 2015 CERN
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This module will set the following variables:
# LIBATTR_FOUND
# LIBATTR_INCLUDE_DIRS
# LIBATTR_LIBRARIES
find_path(LIBATTR_INCLUDE_DIRS
xattr.h
PATHS /usr/include/attr
NO_DEFAULT_PATH)
find_library(LIBATTR_LIBRARIES
NAME attr
PATHS /usr/lib64
NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(libattr DEFAULT_MSG
LIBATTR_INCLUDE_DIRS LIBATTR_LIBRARIES)
# The CERN Tape Archive(CTA) project
# Copyright(C) 2015 CERN
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This module will set the following variables:
# LIBCAP_FOUND
# LIBCAP_INCLUDE_DIRS
# LIBCAP_LIBRARIES
find_path(LIBCAP_INCLUDE_DIRS
capability.h
PATHS /usr/include/sys
NO_DEFAULT_PATH)
find_library(LIBCAP_LIBRARIES
NAME cap
PATHS /usr/lib64
NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(libcap DEFAULT_MSG
LIBCAP_INCLUDE_DIRS LIBCAP_LIBRARIES)
# The CERN Tape Archive(CTA) project
# Copyright(C) 2015 CERN
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
cmake_minimum_required (VERSION 2.6)
find_package (binutils REQUIRED)
find_package (libattr REQUIRED)
find_package (libcap REQUIRED)
set (COMMON_LIB_SRC_FILES
dataStructures/AdminHost.cpp
dataStructures/AdminUser.cpp
......@@ -90,7 +110,6 @@ install (TARGETS ctacommon DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
target_link_libraries (ctacommon
ctautils
pthread
${SQLITE3_LIBRARY_RELEASE}
uuid
z
Utils
......
......@@ -4,7 +4,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../middletier)
find_package(Protobuf)
find_package(Protobuf REQUIRED)
set (CTAProtoFiles
cta.proto)
......
......@@ -23,7 +23,7 @@ include_directories(/usr/include/shift)
include_directories(${PROJECT_SOURCE_DIR}/tapeserver)
include_directories(${PROJECT_BINARY_DIR}/tapeserver)
find_package(Protobuf)
find_package(Protobuf REQUIRED)
file(GLOB ProtoFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.proto")
PROTOBUF_GENERATE_CPP(ProtoSources ProtoHeaders ${ProtoFiles})
......
......@@ -26,6 +26,7 @@ include_directories(${PROJECT_BINARY_DIR}/tapeserver)
include_directories(${CMAKE_SOURCE_DIR})
include_directories(${PROJECT_BINARY_DIR})
find_package(Protobuf REQUIRED)
find_package( ZLIB REQUIRED )
set(CTATAPESERVERDAEMON_LIBRARY_SRCS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment