Skip to content

Commit c13db66

Browse files
dalerobertsdaleroberts
authored
Merge pull request GeoscienceAustralia#275 from rogerfraser/1.2.9
Update VC Project files with recent changes
2 parents 935d78e + f23013a commit c13db66

File tree

50 files changed

+1630
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1630
-252
lines changed

‎dynadjust/dynadjust/dnaadjust/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ add_library (${PROJECT_NAME} SHARED
2828
${CMAKE_SOURCE_DIR}/include/measurement_types/dnamsrtally.cpp
2929
${CMAKE_SOURCE_DIR}/include/memory/dnafile_mapping.cpp
3030
network_data_loader.cpp
31-
measurement_processor.cpp
31+
measurement_processor.cpp
3232
dnaadjust-stage.cpp
3333
dnaadjust.cpp
3434
${CMAKE_SOURCE_DIR}/dynadjust.rc)

‎dynadjust/dynadjust/dnaadjust/dnaadjust.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
//============================================================================
2121

2222
#include <dynadjust/dnaadjust/dnaadjust.hpp>
23-
#include <dynadjust/dnaadjust/network_data_loader.hpp>
2423

2524
#include <dynadjust/dnaadjust/dnaadjust-multi.cpp>
2625

‎dynadjust/dynadjust/dnaadjust/dnaadjust.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@
9090
#include <include/parameters/dnaprojection.hpp>
9191
#include <include/thread/dnathreading.hpp>
9292

93-
#include <atomic>
93+
#include <dynadjust/dnaadjust/network_data_loader.hpp>
9494

95-
#include "network_data_loader.hpp"
9695
using namespace dynadjust::datum_parameters;
9796
using namespace dynadjust::measurements;
9897
using namespace dynadjust::math;

‎dynadjust/dynadjust/dnaadjust/dnaadjust_mkl.vcxproj‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@
115115
<ItemGroup>
116116
<ClInclude Include="..\..\include\functions\dnastringfuncs.hpp" />
117117
<ClInclude Include="..\..\include\ide\trace.hpp" />
118-
<ClInclude Include="..\..\include\io\dnaioadj.hpp" />
118+
<ClInclude Include="..\..\include\io\adj_file.hpp" />
119119
<ClInclude Include="..\..\include\io\aml_file.hpp" />
120-
<ClInclude Include="..\..\include\io\dnaioasl.hpp" />
121-
<ClInclude Include="..\..\include\io\dnaiobase.hpp" />
122-
<ClInclude Include="..\..\include\io\dnaiobms.hpp" />
123-
<ClInclude Include="..\..\include\io\dnaiobst.hpp" />
124-
<ClInclude Include="..\..\include\io\dnaiomap.hpp" />
125-
<ClInclude Include="..\..\include\io\dnaioseg.hpp" />
120+
<ClInclude Include="..\..\include\io\asl_file.hpp" />
121+
<ClInclude Include="..\..\include\io\dynadjust_file.hpp" />
122+
<ClInclude Include="..\..\include\io\bms_file.hpp" />
123+
<ClInclude Include="..\..\include\io\bst_file.hpp" />
124+
<ClInclude Include="..\..\include\io\map_file.hpp" />
125+
<ClInclude Include="..\..\include\io\seg_file.hpp" />
126126
<ClInclude Include="..\..\include\io\dnaiosnx.hpp" />
127127
<ClInclude Include="..\..\include\io\dnaiotbu.hpp" />
128128
<ClInclude Include="..\..\include\math\dnamatrix_contiguous.hpp" />
@@ -135,19 +135,21 @@
135135
<ClInclude Include="..\..\include\parameters\dnaprojection.hpp" />
136136
<ClInclude Include="..\..\resource.h" />
137137
<ClInclude Include="dnaadjust.hpp" />
138+
<ClInclude Include="network_data_loader.hpp" />
139+
<ClInclude Include="measurement_processor.hpp" />
138140
<ClInclude Include="precompile.h" />
139141
</ItemGroup>
140142
<ItemGroup>
141143
<ClCompile Include="..\..\include\functions\dnastringfuncs.cpp" />
142144
<ClCompile Include="..\..\include\ide\trace.cpp" />
143-
<ClCompile Include="..\..\include\io\dnaioadj.cpp" />
145+
<ClCompile Include="..\..\include\io\adj_file.cpp" />
144146
<ClCompile Include="..\..\include\io\aml_file.cpp" />
145-
<ClCompile Include="..\..\include\io\dnaioasl.cpp" />
146-
<ClCompile Include="..\..\include\io\dnaiobase.cpp" />
147-
<ClCompile Include="..\..\include\io\dnaiobms.cpp" />
148-
<ClCompile Include="..\..\include\io\dnaiobst.cpp" />
149-
<ClCompile Include="..\..\include\io\dnaiomap.cpp" />
150-
<ClCompile Include="..\..\include\io\dnaioseg.cpp" />
147+
<ClCompile Include="..\..\include\io\asl_file.cpp" />
148+
<ClCompile Include="..\..\include\io\dynadjust_file.cpp" />
149+
<ClCompile Include="..\..\include\io\bms_file.cpp" />
150+
<ClCompile Include="..\..\include\io\bst_file.cpp" />
151+
<ClCompile Include="..\..\include\io\map_file.cpp" />
152+
<ClCompile Include="..\..\include\io\seg_file.cpp" />
151153
<ClCompile Include="..\..\include\io\dnaiosnxwrite.cpp" />
152154
<ClCompile Include="..\..\include\io\dnaiotbu.cpp" />
153155
<ClCompile Include="..\..\include\math\dnamatrix_contiguous.cpp" />
@@ -162,6 +164,8 @@
162164
<ClCompile Include="..\..\include\parameters\dnaprojection.cpp" />
163165
<ClCompile Include="dnaadjust-stage.cpp" />
164166
<ClCompile Include="dnaadjust.cpp" />
167+
<ClCompile Include="network_data_loader.cpp" />
168+
<ClCompile Include="measurement_processor.cpp" />
165169
<ClCompile Include="precompile.cpp">
166170
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
167171
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

‎dynadjust/dynadjust/dnaadjust/dnaadjust_mkl.vcxproj.filters‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18+
<ClInclude Include="network_data_loader.hpp">
19+
<Filter>Header Files</Filter>
20+
</ClInclude>
21+
<ClInclude Include="measurement_processor.hpp">
22+
<Filter>Header Files</Filter>
23+
</ClInclude>
1824
<ClInclude Include="dnaadjust.hpp">
1925
<Filter>Header Files</Filter>
2026
</ClInclude>
@@ -24,25 +30,25 @@
2430
<ClInclude Include="..\..\include\ide\trace.hpp">
2531
<Filter>Header Files</Filter>
2632
</ClInclude>
27-
<ClInclude Include="..\..\include\io\dnaioadj.hpp">
33+
<ClInclude Include="..\..\include\io\adj_file.hpp">
2834
<Filter>Header Files</Filter>
2935
</ClInclude>
30-
<ClInclude Include="..\..\include\io\dnaiobms.hpp">
36+
<ClInclude Include="..\..\include\io\bms_file.hpp">
3137
<Filter>Header Files</Filter>
3238
</ClInclude>
33-
<ClInclude Include="..\..\include\io\dnaiobst.hpp">
39+
<ClInclude Include="..\..\include\io\bst_file.hpp">
3440
<Filter>Header Files</Filter>
3541
</ClInclude>
36-
<ClInclude Include="..\..\include\io\dnaiomap.hpp">
42+
<ClInclude Include="..\..\include\io\map_file.hpp">
3743
<Filter>Header Files</Filter>
3844
</ClInclude>
39-
<ClInclude Include="..\..\include\io\dnaioseg.hpp">
45+
<ClInclude Include="..\..\include\io\seg_file.hpp">
4046
<Filter>Header Files</Filter>
4147
</ClInclude>
4248
<ClInclude Include="..\..\include\functions\dnastringfuncs.hpp">
4349
<Filter>Header Files</Filter>
4450
</ClInclude>
45-
<ClInclude Include="..\..\include\io\dnaioasl.hpp">
51+
<ClInclude Include="..\..\include\io\asl_file.hpp">
4652
<Filter>Header Files</Filter>
4753
</ClInclude>
4854
<ClInclude Include="..\..\include\io\aml_file.hpp">
@@ -51,7 +57,7 @@
5157
<ClInclude Include="..\..\include\io\dnaiosnx.hpp">
5258
<Filter>Header Files</Filter>
5359
</ClInclude>
54-
<ClInclude Include="..\..\include\io\dnaiobase.hpp">
60+
<ClInclude Include="..\..\include\io\dynadjust_file.hpp">
5561
<Filter>Header Files</Filter>
5662
</ClInclude>
5763
<ClInclude Include="..\..\include\parameters\dnaprojection.hpp">
@@ -86,6 +92,12 @@
8692
</ClInclude>
8793
</ItemGroup>
8894
<ItemGroup>
95+
<ClInclude Include="network_data_loader.cpp">
96+
<Filter>Source Files</Filter>
97+
</ClInclude>
98+
<ClInclude Include="measurement_processor.cpp">
99+
<Filter>Source Files</Filter>
100+
</ClInclude>
89101
<ClCompile Include="dnaadjust.cpp">
90102
<Filter>Source Files</Filter>
91103
</ClCompile>
@@ -98,19 +110,19 @@
98110
<ClCompile Include="..\..\include\measurement_types\dnastation.cpp">
99111
<Filter>Source Files</Filter>
100112
</ClCompile>
101-
<ClCompile Include="..\..\include\io\dnaioadj.cpp">
113+
<ClCompile Include="..\..\include\io\adj_file.cpp">
102114
<Filter>Source Files</Filter>
103115
</ClCompile>
104-
<ClCompile Include="..\..\include\io\dnaiobms.cpp">
116+
<ClCompile Include="..\..\include\io\bms_file.cpp">
105117
<Filter>Source Files</Filter>
106118
</ClCompile>
107-
<ClCompile Include="..\..\include\io\dnaiobst.cpp">
119+
<ClCompile Include="..\..\include\io\bst_file.cpp">
108120
<Filter>Source Files</Filter>
109121
</ClCompile>
110-
<ClCompile Include="..\..\include\io\dnaiomap.cpp">
122+
<ClCompile Include="..\..\include\io\map_file.cpp">
111123
<Filter>Source Files</Filter>
112124
</ClCompile>
113-
<ClCompile Include="..\..\include\io\dnaioseg.cpp">
125+
<ClCompile Include="..\..\include\io\seg_file.cpp">
114126
<Filter>Source Files</Filter>
115127
</ClCompile>
116128
<ClCompile Include="..\..\include\functions\dnastringfuncs.cpp">
@@ -119,7 +131,7 @@
119131
<ClCompile Include="..\..\include\measurement_types\dnastntally.cpp">
120132
<Filter>Source Files</Filter>
121133
</ClCompile>
122-
<ClCompile Include="..\..\include\io\dnaioasl.cpp">
134+
<ClCompile Include="..\..\include\io\asl_file.cpp">
123135
<Filter>Source Files</Filter>
124136
</ClCompile>
125137
<ClCompile Include="..\..\include\io\aml_file.cpp">
@@ -128,7 +140,7 @@
128140
<ClCompile Include="..\..\include\io\dnaiosnxwrite.cpp">
129141
<Filter>Source Files</Filter>
130142
</ClCompile>
131-
<ClCompile Include="..\..\include\io\dnaiobase.cpp">
143+
<ClCompile Include="..\..\include\io\dynadjust_file.cpp">
132144
<Filter>Source Files</Filter>
133145
</ClCompile>
134146
<ClCompile Include="..\..\include\parameters\dnaellipsoid.cpp">

‎dynadjust/dynadjust/dnaadjust/dnaadjust_openblas.vcxproj‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@
111111
<ItemGroup>
112112
<ClInclude Include="..\..\include\functions\dnastringfuncs.hpp" />
113113
<ClInclude Include="..\..\include\ide\trace.hpp" />
114-
<ClInclude Include="..\..\include\io\dnaioadj.hpp" />
114+
<ClInclude Include="..\..\include\io\adj_file.hpp" />
115115
<ClInclude Include="..\..\include\io\aml_file.hpp" />
116-
<ClInclude Include="..\..\include\io\dnaioasl.hpp" />
117-
<ClInclude Include="..\..\include\io\dnaiobase.hpp" />
118-
<ClInclude Include="..\..\include\io\dnaiobms.hpp" />
119-
<ClInclude Include="..\..\include\io\dnaiobst.hpp" />
120-
<ClInclude Include="..\..\include\io\dnaiomap.hpp" />
121-
<ClInclude Include="..\..\include\io\dnaioseg.hpp" />
116+
<ClInclude Include="..\..\include\io\asl_file.hpp" />
117+
<ClInclude Include="..\..\include\io\dynadjust_file.hpp" />
118+
<ClInclude Include="..\..\include\io\bms_file.hpp" />
119+
<ClInclude Include="..\..\include\io\bst_file.hpp" />
120+
<ClInclude Include="..\..\include\io\map_file.hpp" />
121+
<ClInclude Include="..\..\include\io\seg_file.hpp" />
122122
<ClInclude Include="..\..\include\io\dnaiosnx.hpp" />
123123
<ClInclude Include="..\..\include\io\dnaiotbu.hpp" />
124124
<ClInclude Include="..\..\include\math\dnamatrix_contiguous.hpp" />
@@ -131,19 +131,21 @@
131131
<ClInclude Include="..\..\include\parameters\dnaprojection.hpp" />
132132
<ClInclude Include="..\..\resource.h" />
133133
<ClInclude Include="dnaadjust.hpp" />
134+
<ClInclude Include="network_data_loader.hpp" />
135+
<ClInclude Include="measurement_processor.hpp" />
134136
<ClInclude Include="precompile.h" />
135137
</ItemGroup>
136138
<ItemGroup>
137139
<ClCompile Include="..\..\include\functions\dnastringfuncs.cpp" />
138140
<ClCompile Include="..\..\include\ide\trace.cpp" />
139-
<ClCompile Include="..\..\include\io\dnaioadj.cpp" />
141+
<ClCompile Include="..\..\include\io\adj_file.cpp" />
140142
<ClCompile Include="..\..\include\io\aml_file.cpp" />
141-
<ClCompile Include="..\..\include\io\dnaioasl.cpp" />
142-
<ClCompile Include="..\..\include\io\dnaiobase.cpp" />
143-
<ClCompile Include="..\..\include\io\dnaiobms.cpp" />
144-
<ClCompile Include="..\..\include\io\dnaiobst.cpp" />
145-
<ClCompile Include="..\..\include\io\dnaiomap.cpp" />
146-
<ClCompile Include="..\..\include\io\dnaioseg.cpp" />
143+
<ClCompile Include="..\..\include\io\asl_file.cpp" />
144+
<ClCompile Include="..\..\include\io\dynadjust_file.cpp" />
145+
<ClCompile Include="..\..\include\io\bms_file.cpp" />
146+
<ClCompile Include="..\..\include\io\bst_file.cpp" />
147+
<ClCompile Include="..\..\include\io\map_file.cpp" />
148+
<ClCompile Include="..\..\include\io\seg_file.cpp" />
147149
<ClCompile Include="..\..\include\io\dnaiosnxwrite.cpp" />
148150
<ClCompile Include="..\..\include\io\dnaiotbu.cpp" />
149151
<ClCompile Include="..\..\include\math\dnamatrix_contiguous.cpp" />
@@ -158,6 +160,8 @@
158160
<ClCompile Include="..\..\include\parameters\dnaprojection.cpp" />
159161
<ClCompile Include="dnaadjust-stage.cpp" />
160162
<ClCompile Include="dnaadjust.cpp" />
163+
<ClCompile Include="network_data_loader.cpp" />
164+
<ClCompile Include="measurement_processor.cpp" />
161165
<ClCompile Include="precompile.cpp">
162166
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
163167
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -169,4 +173,4 @@
169173
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
170174
<ImportGroup Label="ExtensionTargets">
171175
</ImportGroup>
172-
</Project>
176+
</Project>

0 commit comments

Comments
 (0)