Skip to content

Commit 8500608

Browse files
niklworsniklwors
committed
Moved boost::extension to Source/utils/ folder
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12094 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 331b859 commit 8500608

File tree

37 files changed

+1902
-40
lines changed

37 files changed

+1902
-40
lines changed

‎SimulationRuntime/cpp/Source/CMakeLists.txt‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
cmake_minimum_required (VERSION 2.6)
22

3+
4+
5+
36
project(CppSolverInterface)
47
# on windows boost,blas,lapack and sundial solvers from omdev is used else the installed versions are used
58
IF( WIN32 )
@@ -184,8 +187,32 @@ if(INSTALL_OMDEV_LIBS)
184187
#install (FILES "${Boost_LIBRARIES}" DESTINATION bin)
185188
endif()
186189

190+
191+
MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST)
192+
193+
FOREACH(HEADER ${${HEADER_LIST}})
194+
STRING(REGEX MATCH "(.*)[/\\]" DIR ${HEADER})
195+
INSTALL(FILES ${HEADER} DESTINATION include/omc/cpp/${DIR})
196+
ENDFOREACH(HEADER)
197+
198+
ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
199+
200+
201+
202+
187203
install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION include/omc/cpp)
188204
install (FILES "DataExchange/Interfaces/IHistory.h"
189205
DESTINATION include/omc/cpp/DataExchange/Interfaces)
190-
206+
207+
208+
#copy utils/extension
209+
SET(HS utils/extension/adaptable_factory.hpp utils/extension/common.hpp utils/extension/convenience.hpp
210+
utils/extension/extension.hpp utils/extension/factory.hpp utils/extension/factory_map.hpp utils/extension/filesystem.hpp
211+
utils/extension/parameter.hpp utils/extension/parameter_map.hpp utils/extension/registry.hpp utils/extension/shared_library.hpp
212+
utils/extension/type_map.hpp
213+
utils/extension/impl/adaptable_factory.hpp utils/extension/impl/adaptable_factory_free_functions.hpp utils/extension/impl/adaptable_factory_set.hpp
214+
utils/extension/impl/create.hpp utils/extension/impl/create_func.hpp utils/extension/impl/decl.hpp
215+
utils/extension/impl/factory.hpp utils/extension/impl/factory_map.hpp utils/extension/impl/function.hpp utils/extension/impl/library_impl.hpp
216+
utils/extension/impl/shared_library.hpp utils/extension/impl/typeinfo.hpp)
217+
INSTALL_HEADERS_WITH_DIRECTORY(HS)
191218

‎SimulationRuntime/cpp/Source/SettingsFactory/Implementation/stdafx.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ using namespace std;
2323
#include <boost/shared_ptr.hpp>
2424

2525

26-
#include <boost/extension/shared_library.hpp>
27-
#include <boost/extension/extension.hpp>
28-
#include <boost/extension/type_map.hpp>
29-
#include <boost/extension/factory.hpp>
30-
#include <boost/extension/convenience.hpp>
26+
#include "utils/extension/shared_library.hpp"
27+
#include "utils/extension/extension.hpp"
28+
#include "utils/extension/extension.hpp"
29+
#include "utils/extension/factory.hpp"
30+
#include "utils/extension/convenience.hpp"
3131
using namespace boost::extensions;
3232

3333
using std::ios;

‎SimulationRuntime/cpp/Source/SimManager/stdafx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <boost/numeric/ublas/matrix_proxy.hpp>
1818
#include "boost/tuple/tuple.hpp"
1919
#include <boost/shared_ptr.hpp>
20-
#include <boost/extension/type_map.hpp>
21-
#include <boost/extension/shared_library.hpp>
22-
#include <boost/extension/convenience.hpp>
20+
#include "utils/extension/extension.hpp"
21+
#include "utils/extension/shared_library.hpp"
22+
#include "utils/extension/convenience.hpp"
2323
using namespace boost::extensions;
2424
using boost::tuple;
2525
using boost::tie;

‎SimulationRuntime/cpp/Source/Solver/CVode/Implementation/stdafx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include <boost/serialization/nvp.hpp>
2626
#include <string>
2727
#include <fstream>
28-
#include <boost/extension/extension.hpp>
28+
#include "utils/extension/extension.hpp"
2929
#include <typeinfo>
30-
#include <boost/extension/type_map.hpp>
31-
#include <boost/extension/factory.hpp>
30+
#include "utils/extension/type_map.hpp"
31+
#include "utils/extension/factory.hpp"
3232
using namespace boost::numeric;
3333
using namespace std;
3434
using std::ios;

‎SimulationRuntime/cpp/Source/Solver/Euler/Implementation/stdafx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
#include <boost/serialization/nvp.hpp>
2727
#include <string>
2828
#include <fstream>
29-
#include <boost/extension/extension.hpp>
29+
#include "utils/extension/extension.hpp"
3030
#include <typeinfo>
31-
#include <boost/extension/type_map.hpp>
32-
#include <boost/extension/factory.hpp>
31+
#include "utils/extension/type_map.hpp"
32+
#include "utils/extension/factory.hpp"
3333
using namespace boost::numeric;
3434
using namespace std;
3535
using std::ios;

‎SimulationRuntime/cpp/Source/Solver/Ida/Implementation/stdafx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include <boost/serialization/nvp.hpp>
2626
#include <string>
2727
#include <fstream>
28-
#include <boost/extension/extension.hpp>
28+
#include "utils/extension/extension.hpp"
2929
#include <typeinfo>
30-
#include <boost/extension/type_map.hpp>
31-
#include <boost/extension/factory.hpp>
30+
#include "utils/extension/type_map.hpp"
31+
#include "utils/extension/factory.hpp"
3232
using namespace boost::numeric;
3333
using namespace std;
3434
using std::ios;

‎SimulationRuntime/cpp/Source/Solver/Idas/Implementation/stdafx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include <boost/serialization/nvp.hpp>
2626
#include <string>
2727
#include <fstream>
28-
#include <boost/extension/extension.hpp>
28+
#include "utils/extension/extension.hpp"
2929
#include <typeinfo>
30-
#include <boost/extension/type_map.hpp>
31-
#include <boost/extension/factory.hpp>
30+
#include "utils/extension/type_map.hpp"
31+
#include "utils/extension/factory.hpp"
3232
using namespace boost::numeric;
3333
using namespace std;
3434
using std::ios;

‎SimulationRuntime/cpp/Source/Solver/Implementation/stdafx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include <boost/archive/xml_oarchive.hpp>
1919
#include <boost/archive/xml_iarchive.hpp>
2020
#include <boost/serialization/nvp.hpp>
21-
#include <boost/extension/extension.hpp>
22-
#include <boost/extension/factory.hpp>
23-
#include <boost/extension/type_map.hpp>
21+
#include "utils/extension/extension.hpp"
22+
#include "utils/extension/factory.hpp"
23+
#include "utils/extension/type_map.hpp"
2424
#include <fstream>
2525
using namespace boost::numeric;
2626
using namespace std;

‎SimulationRuntime/cpp/Source/System/Implementation/AlgLoopSolverFactory.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "stdafx.h"
22
#include "AlgLoopSolverFactory.h"
3-
#include <boost/extension/shared_library.hpp>
4-
#include <boost/extension/convenience.hpp>
3+
#include "utils/extension/shared_library.hpp"
4+
#include "utils/extension/convenience.hpp"
55
#include "LibrariesConfig.h"
66
AlgLoopSolverFactory::AlgLoopSolverFactory()
77
{

‎SimulationRuntime/cpp/Source/System/Implementation/stdafx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include <boost/numeric/ublas/matrix_proxy.hpp>
1616
#include <boost/shared_ptr.hpp>
1717
#include <boost/weak_ptr.hpp>
18-
#include <boost/extension/extension.hpp>
19-
#include <boost/extension/factory.hpp>
20-
#include <boost/extension/type_map.hpp>
18+
#include "utils/extension/extension.hpp"
19+
#include "utils/extension/factory.hpp"
20+
#include "utils/extension/type_map.hpp"
2121

2222
using namespace boost::extensions;
2323
using namespace std;

0 commit comments

Comments
 (0)