Commit 2a8c3712 authored by Steven Murray's avatar Steven Murray
Browse files

Renamed the utils directory to common

parent bf6e61fe
......@@ -31,7 +31,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
include_directories(${PROJECT_SOURCE_DIR})
add_subdirectory(utils)
add_subdirectory(common)
add_subdirectory(objectstore)
add_subdirectory(middletier)
add_subdirectory(nameserver)
......
cmake_minimum_required (VERSION 2.6)
set (UTILS_LIB_SRC_FILES
set (COMMON_LIB_SRC_FILES
Timer.cpp
Utils.cpp
exception/Backtrace.cpp
......@@ -11,15 +11,15 @@ set (UTILS_LIB_SRC_FILES
threading/Mutex.cpp
threading/Threading.cpp)
add_library (ctautils SHARED
${UTILS_LIB_SRC_FILES})
add_library (ctacommon SHARED
${COMMON_LIB_SRC_FILES})
target_link_libraries (ctautils ${SQLITE3_LIBRARY_RELEASE}
target_link_libraries (ctacommon
${SQLITE3_LIBRARY_RELEASE}
pthread)
set (UTILS_UNIT_TESTS_LIB_SRC_FILES
set (COMMON_UNIT_TESTS_LIB_SRC_FILES
UtilsTest.cpp)
add_library (ctautilsunittests SHARED
${UTILS_UNIT_TESTS_LIB_SRC_FILES})
add_library (ctacommonunittests SHARED
${COMMON_UNIT_TESTS_LIB_SRC_FILES})
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "utils/exception/Exception.hpp"
#include "utils/Utils.hpp"
#include "common/exception/Exception.hpp"
#include "common/Utils.hpp"
#include <sstream>
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "utils/Utils.hpp"
#include "common/Utils.hpp"
#include <gtest/gtest.h>
......
......@@ -40,8 +40,8 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "utils/exception/Errnum.hpp"
#include "utils/exception/strerror_r_wrapper.h"
#include "common/exception/Errnum.hpp"
#include "common/exception/strerror_r_wrapper.h"
#include <string.h>
#include <errno.h>
......
......@@ -40,7 +40,7 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "utils/exception/Exception.hpp"
#include "common/exception/Exception.hpp"
//------------------------------------------------------------------------------
// constructor
......
......@@ -42,7 +42,7 @@
#pragma once
#include "utils/exception/Backtrace.hpp"
#include "common/exception/Backtrace.hpp"
#include <exception>
#include <sstream>
......
......@@ -40,8 +40,8 @@
*****************************************************************************/
#pragma once
#include "utils/exception/Errnum.hpp"
#include "utils/exception/Exception.hpp"
#include "common/exception/Errnum.hpp"
#include "common/exception/Exception.hpp"
#include <unistd.h>
......
......@@ -16,9 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "utils/threading/Mutex.hpp"
#include "utils/exception/Errnum.hpp"
#include "utils/exception/Exception.hpp"
#include "common/threading/Mutex.hpp"
#include "common/exception/Errnum.hpp"
#include "common/exception/Exception.hpp"
//------------------------------------------------------------------------------
//constructor
......
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