hopefully, this commit will fix the build of cminpack together with t…

…he cppruntime git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18797 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 27, 2014 · f597bc5 · f597bc5
1 parent 635d750
commit f597bc5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -192,6 +192,7 @@ CMinpack:
 	#cp -rp 3rdParty/CMinpack/install/include/* $(builddir_inc)
 
 CMinpack-clean:
+	rm -rf 3rdParty/CMinpack/install
 	if test -f 3rdParty/CMinpack/build/Makefile; then make -C 3rdParty/CMinpack/build clean; fi
 	rm -f 3rdParty/CMinpack/build/Makefile
 

diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -178,7 +178,7 @@ include_directories ("Include/Solver")
 #add  Euler solver project
 add_subdirectory (Solver/Euler)
 add_subdirectory (Solver/Newton)
-#add_subdirectory (Solver/Hybrj)
+add_subdirectory (Solver/Hybrj)
 
 
 if(REDUCE_DAE)

diff --git a/SimulationRuntime/cpp/Solver/Hybrj/Hybrj.cpp b/SimulationRuntime/cpp/Solver/Hybrj/Hybrj.cpp
@@ -418,7 +418,7 @@ void Hybrj::calcJacobian(double *fjac)
 
 }
 
-void Hybrj::fcn(const int *n, const double *x, double *fvec, double *fjac, const int *ldfjac, int *iflag,void* userdata)
+void Hybrj::fcn(const int *n, const double *x, double *fvec, double *fjac, const int *ldfjac, int *iflag, void* userdata)
 {
     if(*iflag == 1)
     {