Commit 744bb13d authored by Pawel Sznajder's avatar Pawel Sznajder
Browse files

Merge branch 'UpdatedDependencies' into 'master'

Updating code to more recent version of the the dependencies

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