Commit 2e55baf4 authored by Valerio Bertone's avatar Valerio Bertone
Browse files

Updating code to more recent version of the the dependencies

parent ad9f6f2b
......@@ -2,3 +2,9 @@
/.settings/
/lib/
/NumA++.doxyfile.bak
CMakeCache.txt
CMakeFiles/
Makefile
NumA++_autogen/
cmake_install.cmake
install_manifest.txt
......@@ -7,7 +7,12 @@ cmake_minimum_required(VERSION 2.6)
project(NumA++ CXX)
# define c++ standard and issue all the warning demanded by this standard
add_definitions(-std=c++98 -pedantic)
add_definitions(-std=c++11 -pedantic -Wno-vla-extension)
set(CMAKE_CXX_STANDARD 11)
if (NOT DEFINED CMAKE_MACOSX_RPATH)
set(CMAKE_MACOSX_RPATH 0)
endif()
# VERSION ==================================================================================
......@@ -35,6 +40,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# FIND LIBRARIES ===========================================================================
# find libraries: Qt
find_package(Qt5 COMPONENTS Core)
# find libraries: additional modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
......@@ -48,7 +56,7 @@ find_package(Eigen3 REQUIRED)
find_package(ElementaryUtils REQUIRED)
# directories containing headers
include_directories(${SFML_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${ELEMENTARY_UTILS_INCLUDE_DIR})
include_directories(${SFML_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${ElementaryUtils_INCLUDE_DIR})
include_directories(include)
# FINALIZE ==================================================================================
......@@ -82,12 +90,12 @@ target_link_libraries(
${SFML_LIBRARIES}
${ELEMENTARY_UTILS_LIBRARIES}
${ElementaryUtils_LIBRARIES}
)
# install
install(TARGETS NumA++
RUNTIME DESTINATION bin/PARTONS
LIBRARY DESTINATION lib/PARTONS
ARCHIVE DESTINATION lib/static/PARTONS)
install(DIRECTORY include/ DESTINATION include/PARTONS)
\ No newline at end of file
install(TARGETS NumA++
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
install(DIRECTORY include DESTINATION include)
......@@ -2,18 +2,18 @@
#
# Once done this will define
#
# ELEMENTARY_UTILS_FOUND - system has Elementary_Utils lib
# ELEMENTARY_UTILS_LIBRARIES - the path of the library
# ELEMENTARY_UTILS_INCLUDE_DIR - the include directory
# ElementaryUtils_FOUND - system has Elementary_Utils lib
# ElementaryUtils_LIBRARIES - the path of the library
# ElementaryUtils_INCLUDE_DIR - the include directory
if (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
if (ElementaryUtils_INCLUDE_DIR AND ElementaryUtils_LIBRARIES)
# in cache already
set(ELEMENTARY_UTILS_FOUND TRUE)
set(ElementaryUtils_FOUND TRUE)
else (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
else (ElementaryUtils_INCLUDE_DIR AND ElementaryUtils_LIBRARIES)
find_path(ELEMENTARY_UTILS_INCLUDE_DIR ElementaryUtils/PropertiesManager.h
find_path(ElementaryUtils_INCLUDE_DIR ElementaryUtils/PropertiesManager.h
PATHS
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../ElementaryUtils
......@@ -24,7 +24,7 @@ else (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
PATH_SUFFIXES include/PARTONS include
)
find_library(ELEMENTARY_UTILS_LIBRARIES
find_library(ElementaryUtils_LIBRARIES
NAMES ElementaryUtils
PATHS
${CMAKE_INSTALL_PREFIX}
......@@ -36,7 +36,7 @@ else (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
PATH_SUFFIXES lib/PARTONS lib64/PARTONS bin/PARTONS lib lib64 bin)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ELEMENTARY_UTILS DEFAULT_MSG ELEMENTARY_UTILS_INCLUDE_DIR ELEMENTARY_UTILS_LIBRARIES)
find_package_handle_standard_args(ElementaryUtils DEFAULT_MSG ElementaryUtils_INCLUDE_DIR ElementaryUtils_LIBRARIES)
endif(ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
endif(ElementaryUtils_INCLUDE_DIR AND ElementaryUtils_LIBRARIES)
......@@ -21,7 +21,7 @@ void ExtrapolationTable::append_table(double y) {
void ExtrapolationTable::qelg(double& result, double& abserr) {
std::vector<double> epstab = m_rlist2;
std::vector<double> res3la = res3la;
std::vector<double> res3la = m_res3la;
const size_t n = m_n - 1;
const double current = epstab[n];
......
......@@ -46,12 +46,15 @@ unsigned int IntegratorRegistry::registerIntegrator(Integrator* pIntegrator) {
//
// // Return the final class identifier to persist it into the static classId variable of the registered class.
// return classId;
return 0;
} // mutex.unlock();
Integrator* IntegratorRegistry::get(unsigned int classId) const {
return NULL;
}
Integrator* IntegratorRegistry::get(const std::string& className) const {
return NULL;
}
} // namespace NumA
......@@ -134,7 +134,7 @@ namespace NumA {
};
std::cout << " If this point is reached, there is a problem in computing the spline" << std::endl ;
return 0;
}
......
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