Commit 04e2a686 authored by Katter, Janike Yvonne's avatar Katter, Janike Yvonne
Browse files

Small changes

parent 3540bd99
Pipeline #34791 passed with stage
in 12 seconds
......@@ -6,7 +6,7 @@ include(PreventInSourceBuilds)
option(LMFIT_CPPTEST "Build cpp demos" ON)
if(LMFIT_CPPTEST)
project(lmfit VERSION 8.2.1)
project(lmfit VERSION 8.2.1 LANGUAGES C CXX)
else()
project(lmfit VERSION 8.2.1 LANGUAGES C)
endif()
......@@ -26,7 +26,6 @@ option(WERROR "Treat warnings as errors" OFF)
## Compiler settings.
set(CMAKE_C_STANDARD 99)
if(LMFIT_CPPTEST)
set(CMAKE_CXX_STANDARD 17)
endif()
......
......@@ -2,7 +2,7 @@ set(lib lmfit)
set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
set(src_files lmcurve.c lmmin.c lminvert.c)
set(inc_files lmcurve.h lmmin.h lmstruct.h lmdecls.h)
set(inc_files lmcurve.h lmmin.h lmstruct.h lmdecls.h lmfit.hpp)
add_library(${lib} ${src_files})
......@@ -27,10 +27,6 @@ install(
FILES ${inc_files}
DESTINATION ${destination}/include
COMPONENT Headers)
install(
FILES lmfit.hpp
DESTINATION ${destination}/include
COMPONENT Headers)
if(WIN32)
set(CPACK_PACKAGE_VENDOR "Forschungszentrum Jülich GmbH")
......
......@@ -26,12 +26,8 @@ typedef struct lm_result_struct{
std::vector<double> covar;
lm_status_struct status;
lm_result_struct(std::vector<double>& start_par)
{
par = start_par;
int n = par.size();
parerr = std::vector<double>(n);
covar = std::vector<double>(n*n);
}
: par(start_par), parerr(std::vector<double>(start_par.size())),
covar(std::vector<double>(start_par.size()*start_par.size())) {}
} lm_result_struct;
lm_result_struct fit_curve(std::vector<double>& par,
......
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