File: omit_boost_system.patch

package info (click to toggle)
stopt 6.1%2Bdfsg-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 9,380 kB
  • sloc: cpp: 75,778; python: 6,012; makefile: 72; sh: 57
file content (247 lines) | stat: -rw-r--r-- 36,404 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
Description: removing links to Boost system library, which has been removed
 in boost 1.90
Author: Pierre Gruet <pgt@debian.org>
Bug-Debian: https://bugs.debian.org/1127283
Forwarded: https://gitlab.com/stochastic-control/StOpt/-/work_items/15 
Last-Update: 2026-03-06

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@
 
 # Boost
 IF(BUILD_TEST)
-  FIND_PACKAGE(Boost COMPONENTS unit_test_framework  system  timer chrono log thread  REQUIRED)
+  FIND_PACKAGE(Boost COMPONENTS unit_test_framework timer chrono log thread  REQUIRED)
 ENDIF()
 MESSAGE(STATUS "Boost unit_test_framework: ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
 FIND_PACKAGE(Boost COMPONENTS  random REQUIRED)
@@ -137,10 +137,10 @@
     ENDIF(Boost_MPI_FOUND)
   ENDIF(NOT MPI_CXX_FOUND)
 
-  TARGET_LINK_LIBRARIES(StOpt-mpi-stat ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES}    ${Boost_CHRONO_LIBRARY}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY}  ${Boost_LOG_LIBRARY}  ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES})
-  TARGET_LINK_LIBRARIES(StOpt-mpi-python-dyn ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES}    ${Boost_CHRONO_LIBRARY}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY}  ${Boost_LOG_LIBRARY}  ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES})
-  TARGET_LINK_LIBRARIES(StOpt-dyn     ${Boost_CHRONO_LIBRARY}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY} ${Boost_LOG_LIBRARY} ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES} )
-  TARGET_LINK_LIBRARIES(StOpt-stat     ${Boost_CHRONO_LIBRARY}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY} ${Boost_LOG_LIBRARY} ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES} )
+  TARGET_LINK_LIBRARIES(StOpt-mpi-stat ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES}    ${Boost_CHRONO_LIBRARY}  ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY}  ${Boost_LOG_LIBRARY}  ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES})
+  TARGET_LINK_LIBRARIES(StOpt-mpi-python-dyn ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES}    ${Boost_CHRONO_LIBRARY}  ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY}  ${Boost_LOG_LIBRARY}  ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES})
+  TARGET_LINK_LIBRARIES(StOpt-dyn     ${Boost_CHRONO_LIBRARY}  ${Boost_TIMER_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY} ${Boost_LOG_LIBRARY} ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES} )
+  TARGET_LINK_LIBRARIES(StOpt-stat     ${Boost_CHRONO_LIBRARY}  ${Boost_TIMER_LIBRARY}  ${Boost_SERIALIZATION_LIBRARY} ${GENERS_LIB} ${Boost_RANDOM_LIBRARY} ${Boost_LOG_LIBRARY} ${BZIP2_LIBRARIES}  ${ZLIB_LIBRARIES} )
 
 IF(OPENMP_CXX_FOUND)
   TARGET_LINK_LIBRARIES(StOpt-mpi-stat OpenMP::OpenMP_CXX)
@@ -395,13 +395,13 @@
   ADD_EXECUTABLE(testGridAndRegressedValue ${SOURCE_UNIT_TEST_REGRESSION}/testGridAndRegressedValue.cpp)
   TARGET_LINK_LIBRARIES(testGridAndRegressedValue ${STOPT_LIB} ${GENERS_LIB}  ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY}   ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testDominanceKernel ${SOURCE_UNIT_TEST_REGRESSION}/testDominanceKernel.cpp)
-  TARGET_LINK_LIBRARIES(testDominanceKernel  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testDominanceKernel  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testLaplacianKernel ${SOURCE_UNIT_TEST_REGRESSION}/testLaplacianKernel.cpp)
-  TARGET_LINK_LIBRARIES(testLaplacianKernel  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testLaplacianKernel  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testLocalCutsGridAdapt1D ${SOURCE_UNIT_TEST_REGRESSION}/testLocalCutsGridAdapt1D.cpp)
-  TARGET_LINK_LIBRARIES(testLocalCutsGridAdapt1D  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testLocalCutsGridAdapt1D  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testLocalCutsGridAdapt2D ${SOURCE_UNIT_TEST_REGRESSION}/testLocalCutsGridAdapt2D.cpp)
-  TARGET_LINK_LIBRARIES(testLocalCutsGridAdapt2D  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testLocalCutsGridAdapt2D  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
     
   SET(SOURCE_UNIT_TEST_GRIDS ${SOURCE_UNIT_TEST}/grids)
   ADD_EXECUTABLE(testRegularSpaceGrid ${SOURCE_UNIT_TEST_GRIDS}/testRegularSpaceGrid.cpp)
@@ -459,29 +459,29 @@
   ADD_EXECUTABLE(testAmericanOptionForSparse ${SOURCE_FUNC_TEST}/testAmericanOptionForSparse.cpp)
   TARGET_LINK_LIBRARIES(testAmericanOptionForSparse  ${STOPT_LIB}  ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorage  ${SOURCE_FUNC_TEST}/testGasStorage.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorage  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorage  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageMultiStage  ${SOURCE_FUNC_TEST}/testGasStorageMultiStage.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageMultiStage   ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageMultiStage   ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageTree  ${SOURCE_FUNC_TEST}/testGasStorageTree.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageTree  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageTree  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageGlobal  ${SOURCE_FUNC_TEST}/testGasStorageGlobal.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageGlobal  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageGlobal  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageKMeans  ${SOURCE_FUNC_TEST}/testGasStorageKMeans.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageKMeans  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageKMeans  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageKernel  ${SOURCE_FUNC_TEST}/testGasStorageKernel.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageLaplacianConstKernel  ${SOURCE_FUNC_TEST}/testGasStorageLaplacianConstKernel.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageLaplacianConstKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageLaplacianConstKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageLaplacianLinearKernel  ${SOURCE_FUNC_TEST}/testGasStorageLaplacianLinearKernel.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageLaplacianLinearKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageLaplacianLinearKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageLaplacianGridKernel  ${SOURCE_FUNC_TEST}/testGasStorageLaplacianGridKernel.cpp )
-  TARGET_LINK_LIBRARIES(testGasStorageLaplacianGridKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageLaplacianGridKernel  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testLake  ${SOURCE_FUNC_TEST}/testLake.cpp )
-  TARGET_LINK_LIBRARIES(testLake  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testLake  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testLakeIid  ${SOURCE_FUNC_TEST}/testLakeIid.cpp )
-  TARGET_LINK_LIBRARIES(testLakeIid  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testLakeIid  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testGasStorageVaryingCavity  ${SOURCE_FUNC_TEST}/testGasStorageVaryingCavity.cpp)
-  TARGET_LINK_LIBRARIES(testGasStorageVaryingCavity  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testGasStorageVaryingCavity  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testSemiLagragian1  ${SOURCE_FUNC_TEST}/testSemiLagragian1.cpp  )
   TARGET_LINK_LIBRARIES(testSemiLagragian1  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}  ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testSemiLagragian2 ${SOURCE_FUNC_TEST}/testSemiLagragian2.cpp  )
@@ -489,9 +489,9 @@
   ADD_EXECUTABLE(testSemiLagragian3 ${SOURCE_FUNC_TEST}/testSemiLagragian3.cpp )
   TARGET_LINK_LIBRARIES(testSemiLagragian3  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testPortfolioMMModel ${SOURCE_FUNC_TEST}/testPortfolioMMModel.cpp)
-  TARGET_LINK_LIBRARIES(testPortfolioMMModel  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testPortfolioMMModel  ${STOPT_LIB}   ${STOPTTEST_LIB}  ${GENERS_LIB} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
   ADD_EXECUTABLE(testThermalAsset  ${SOURCE_FUNC_TEST}/testThermalAsset.cpp )
-  TARGET_LINK_LIBRARIES(testThermalAsset  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+  TARGET_LINK_LIBRARIES(testThermalAsset  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
 
   
   # for tests
@@ -563,17 +563,17 @@
     ADD_EXECUTABLE(testSwingOptimSimuNDMpi  ${SOURCE_FUNC_TEST}/testSwingOptimSimuNDMpi.cpp)
     TARGET_LINK_LIBRARIES(testSwingOptimSimuNDMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}  ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testLakeMpi  ${SOURCE_FUNC_TEST}/testLakeMpi.cpp )
-    TARGET_LINK_LIBRARIES(testLakeMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+    TARGET_LINK_LIBRARIES(testLakeMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testGasStorageMpi ${SOURCE_FUNC_TEST}/testGasStorageMpi.cpp  )
-    TARGET_LINK_LIBRARIES(testGasStorageMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
+    TARGET_LINK_LIBRARIES(testGasStorageMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testGasStorageMultiStageMpi ${SOURCE_FUNC_TEST}/testGasStorageMultiStageMpi.cpp  )
-    TARGET_LINK_LIBRARIES(testGasStorageMultiStageMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
+    TARGET_LINK_LIBRARIES(testGasStorageMultiStageMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testGasStorageTreeMpi ${SOURCE_FUNC_TEST}/testGasStorageTreeMpi.cpp  )
-    TARGET_LINK_LIBRARIES(testGasStorageTreeMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
+    TARGET_LINK_LIBRARIES(testGasStorageTreeMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testGasStorageGlobalMpi ${SOURCE_FUNC_TEST}/testGasStorageGlobalMpi.cpp  )
-    TARGET_LINK_LIBRARIES(testGasStorageGlobalMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+    TARGET_LINK_LIBRARIES(testGasStorageGlobalMpi  ${STOPT_LIB} ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testGasStorageVaryingCavityMpi  ${SOURCE_FUNC_TEST}/testGasStorageVaryingCavityMpi.cpp )
-    TARGET_LINK_LIBRARIES(testGasStorageVaryingCavityMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+    TARGET_LINK_LIBRARIES(testGasStorageVaryingCavityMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testGasStorageSwitchCostMpi ${SOURCE_FUNC_TEST}/testGasStorageSwitchCostMpi.cpp )
     TARGET_LINK_LIBRARIES(testGasStorageSwitchCostMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}  ${GENERS_LIB}  ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testSemiLagragian1Mpi ${SOURCE_FUNC_TEST}/testSemiLagragian1Mpi.cpp )
@@ -590,7 +590,7 @@
     ADD_EXECUTABLE(testOptionNIGL2 ${SOURCE_FUNC_TEST}/testOptionNIGL2.cpp)
     TARGET_LINK_LIBRARIES(testOptionNIGL2 ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB} ${Boost_TIMER_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_RANDOM_LIBRARY})
     ADD_EXECUTABLE(testThermalAssetMpi  ${SOURCE_FUNC_TEST}/testThermalAssetMpi.cpp )
-    TARGET_LINK_LIBRARIES(testThermalAssetMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
+    TARGET_LINK_LIBRARIES(testThermalAssetMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY})
 
     # proc for MPI
     SET(PROCS 1)
@@ -672,9 +672,9 @@
       ADD_EXECUTABLE(testDemandSDDP ${SOURCE_FUNC_TEST}/testDemandSDDP.cpp)
       TARGET_LINK_LIBRARIES(testDemandSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES}   ${Boost_TIMER_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}   ${COIN_LIBRARIES} ${Boost_RANDOM_LIBRARY})
       ADD_EXECUTABLE(testStorageWithInflowsSDDP ${SOURCE_FUNC_TEST}/testStorageWithInflowsSDDP.cpp)
-      TARGET_LINK_LIBRARIES(testStorageWithInflowsSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}  ${COIN_LIBRARIES}   ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_RANDOM_LIBRARY})
+      TARGET_LINK_LIBRARIES(testStorageWithInflowsSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}  ${COIN_LIBRARIES}    ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY}   ${Boost_TIMER_LIBRARY} ${Boost_RANDOM_LIBRARY})
       ADD_EXECUTABLE(testStorageWithInflowsAndMarketSDDP ${SOURCE_FUNC_TEST}/testStorageWithInflowsAndMarketSDDP.cpp)
-      TARGET_LINK_LIBRARIES(testStorageWithInflowsAndMarketSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}   ${COIN_LIBRARIES}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
+      TARGET_LINK_LIBRARIES(testStorageWithInflowsAndMarketSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_MPI_LIBRARY} ${MPI_CXX_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}   ${COIN_LIBRARIES}   ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY}  ${Boost_RANDOM_LIBRARY})
       SET(PROCS 1)
       ADD_TEST(NAME MyTestDemandSDDPMpi  COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ./testDemandSDDP ${MPIEXEC_POSTFLAGS})
       ADD_TEST(NAME MyTestGasStorageSDDPMpi COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ./testGasStorageSDDP ${MPIEXEC_POSTFLAGS})
@@ -696,9 +696,9 @@
       ADD_EXECUTABLE(testDemandSDDP ${SOURCE_FUNC_TEST}/testDemandSDDP.cpp)
       TARGET_LINK_LIBRARIES(testDemandSDDP  ${STOPT_LIB} ${GENERS_LIB} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}   ${Boost_TIMER_LIBRARY}  ${PTHREAD_LIBRARY}   ${COIN_LIBRARIES} ${Boost_RANDOM_LIBRARY})
       ADD_EXECUTABLE(testStorageWithInflowsSDDP ${SOURCE_FUNC_TEST}/testStorageWithInflowsSDDP.cpp)
-      TARGET_LINK_LIBRARIES(testStorageWithInflowsSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}  ${COIN_LIBRARIES}   ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} )
+      TARGET_LINK_LIBRARIES(testStorageWithInflowsSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}  ${COIN_LIBRARIES}    ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} )
       ADD_EXECUTABLE(testStorageWithInflowsAndMarketSDDP ${SOURCE_FUNC_TEST}/testStorageWithInflowsAndMarketSDDP.cpp)
-      TARGET_LINK_LIBRARIES(testStorageWithInflowsAndMarketSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}   ${COIN_LIBRARIES}  ${Boost_SYSTEM_LIBRARY}  ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} )
+      TARGET_LINK_LIBRARIES(testStorageWithInflowsAndMarketSDDP  ${STOPT_LIB} ${GENERS_LIB}  ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${PTHREAD_LIBRARY}   ${COIN_LIBRARIES}   ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} )
       ADD_TEST(NAME MyTestDemandSDDP  COMMAND ./testDemandSDDP )
       ADD_TEST(NAME MyTestGasStorageSDDP COMMAND ./testGasStorageSDDP)
       ADD_TEST(NAME MyTestReservoirWithInflowsSDDP  COMMAND  ./testReservoirWithInflowsSDDP)
@@ -743,42 +743,42 @@
       IF (WIN32)
 	SET_TARGET_PROPERTIES(testBSCVAEuler PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testBSCVAEuler   ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testBSCVAEuler   ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       ADD_EXECUTABLE(testBSCVAExact ${SOURCE_UNIT_TEST_BRANCHING}/testBSCVAExact.cpp)
       IF (WIN32)
 	SET_TARGET_PROPERTIES(testBSCVAExact PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testBSCVAExact    ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testBSCVAExact    ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       ADD_EXECUTABLE(testHJBEuler ${SOURCE_UNIT_TEST_BRANCHING}/testHJBEuler.cpp)
       IF (WIN32)
 	SET_TARGET_PROPERTIES(testHJBEuler PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testHJBEuler    ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testHJBEuler    ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY}  ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       ADD_EXECUTABLE(testHJBExact ${SOURCE_UNIT_TEST_BRANCHING}/testHJBExact.cpp)
       IF (WIN32)
 	SET_TARGET_PROPERTIES(testHJBExact PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testHJBExact    ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testHJBExact    ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       ADD_EXECUTABLE(testHJBConst ${SOURCE_UNIT_TEST_BRANCHING}/testHJBConst.cpp)
       IF (WIN32)
 	SET_TARGET_PROPERTIES(testHJBConst PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testHJBConst    ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testHJBConst    ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       ADD_EXECUTABLE(testPortfolioEuler ${SOURCE_UNIT_TEST_BRANCHING}/testPortfolioEuler.cpp)
       IF (WIN32)
 	SET_TARGET_PROPERTIES( testPortfolioEuler PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testPortfolioEuler    ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testPortfolioEuler    ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       ADD_EXECUTABLE(testPortfolioExact ${SOURCE_UNIT_TEST_BRANCHING}/testPortfolioExact.cpp)
       IF (WIN32)
 	SET_TARGET_PROPERTIES( testPortfolioExact PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testPortfolioExact    ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testPortfolioExact    ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       ADD_EXECUTABLE(testUD2UToy ${SOURCE_UNIT_TEST_BRANCHING}/testUD2UToy.cpp)
       IF (WIN32)
 	SET_TARGET_PROPERTIES(testUD2UToy  PROPERTIES COMPILE_FLAGS "/Za")
       ENDIF(WIN32)
-      TARGET_LINK_LIBRARIES(testUD2UToy    ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
+      TARGET_LINK_LIBRARIES(testUD2UToy    ${Boost_TIMER_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES} ${TRNG4_LIBRARY})
       SET(PROCS 2)
       ADD_TEST(NAME MyTestSwitchingBSCVAEulerMpi2core  COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ./testBSCVAEuler ${MPIEXEC_POSTFLAGS})
       ADD_TEST(NAME MyTestSwitchingBSCVAExactMpi2core  COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ./testBSCVAExact ${MPIEXEC_POSTFLAGS})
@@ -797,27 +797,27 @@
       ENDIF(NOT COIN_FOUND)
       INCLUDE_DIRECTORIES(SYSTEM ${COIN_INCLUDE_DIRS})
       ADD_EXECUTABLE(testGasStorageCut  ${SOURCE_FUNC_TEST}/testGasStorageCut.cpp )
-      TARGET_LINK_LIBRARIES(testGasStorageCut  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
+      TARGET_LINK_LIBRARIES(testGasStorageCut  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
       ADD_TEST(NAME MyTestForGasStorageCut COMMAND testGasStorageCut)
       INCLUDE_DIRECTORIES(SYSTEM ${COIN_INCLUDE_DIRS})
       ADD_EXECUTABLE(testGasStorageCutGridAdapt1D  ${SOURCE_FUNC_TEST}/testGasStorageCutGridAdapt1D.cpp )
-      TARGET_LINK_LIBRARIES(testGasStorageCutGridAdapt1D  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
+      TARGET_LINK_LIBRARIES(testGasStorageCutGridAdapt1D  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
       ADD_TEST(NAME MyTestForGasStorageCutGridAdapt1D COMMAND testGasStorageCutGridAdapt1D)
       ADD_EXECUTABLE(testGasStorageCutGridAdapt2D  ${SOURCE_FUNC_TEST}/testGasStorageCutGridAdapt2D.cpp )
-      TARGET_LINK_LIBRARIES(testGasStorageCutGridAdapt2D  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
+      TARGET_LINK_LIBRARIES(testGasStorageCutGridAdapt2D  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
       ADD_TEST(NAME MyTestForGasStorageCutGridAdapt2D COMMAND testGasStorageCutGridAdapt2D)
       ADD_EXECUTABLE(testGasStorageTreeCut  ${SOURCE_FUNC_TEST}/testGasStorageTreeCut.cpp )
-      TARGET_LINK_LIBRARIES(testGasStorageTreeCut  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
+      TARGET_LINK_LIBRARIES(testGasStorageTreeCut  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
       ADD_TEST(NAME MyTestForGasStorageTreeCut COMMAND testGasStorageTreeCut)
        IF(BUILD_MPI)
 	ADD_EXECUTABLE(testGasStorageCutMpi  ${SOURCE_FUNC_TEST}/testGasStorageCutMpi.cpp )
-	TARGET_LINK_LIBRARIES(testGasStorageCutMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
+	TARGET_LINK_LIBRARIES(testGasStorageCutMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
 	SET(PROCS 1)
 	ADD_TEST(NAME MyTestForGasStorageCutMpi COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ./testGasStorageCutMpi  ${MPIEXEC_POSTFLAGS}) 
 	SET(PROCS 4)
 	ADD_TEST(NAME MyTestForGasStorageCutMpi4core COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ./testGasStorageCutMpi  ${MPIEXEC_POSTFLAGS})
 	ADD_EXECUTABLE(testGasStorageTreeCutMpi  ${SOURCE_FUNC_TEST}/testGasStorageTreeCutMpi.cpp )
-	TARGET_LINK_LIBRARIES(testGasStorageTreeCutMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}  ${Boost_SYSTEM_LIBRARY}   ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
+	TARGET_LINK_LIBRARIES(testGasStorageTreeCutMpi  ${STOPT_LIB}  ${STOPTTEST_LIB}   ${GENERS_LIB}   ${Boost_TIMER_LIBRARY} ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}    ${Boost_CHRONO_LIBRARY} ${Boost_RANDOM_LIBRARY} ${COIN_LIBRARIES})
 	SET(PROCS 1)
 	ADD_TEST(NAME MyTestForGasStorageTreeCutMpi COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ./testGasStorageTreeCutMpi  ${MPIEXEC_POSTFLAGS}) 
 	SET(PROCS 4)