Skip to content

Commit 6241590

Browse files
bofdahofchennes
bofdahof
authored and
chennes
committed
current src path no longer required
1 parent 9af828d commit 6241590

File tree

15 files changed

+143
-183
lines changed

15 files changed

+143
-183
lines changed

‎tests/src/App/CMakeLists.txt‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
target_compile_definitions(Tests_run PRIVATE DATADIR="${CMAKE_SOURCE_DIR}/data")
22

3-
target_sources(
4-
Tests_run
5-
PRIVATE
6-
${CMAKE_CURRENT_SOURCE_DIR}/Application.cpp
7-
${CMAKE_CURRENT_SOURCE_DIR}/Branding.cpp
8-
${CMAKE_CURRENT_SOURCE_DIR}/Color.cpp
9-
${CMAKE_CURRENT_SOURCE_DIR}/ComplexGeoData.cpp
10-
${CMAKE_CURRENT_SOURCE_DIR}/Document.cpp
11-
${CMAKE_CURRENT_SOURCE_DIR}/DocumentObject.cpp
12-
${CMAKE_CURRENT_SOURCE_DIR}/DocumentObserver.cpp
13-
${CMAKE_CURRENT_SOURCE_DIR}/Expression.cpp
14-
${CMAKE_CURRENT_SOURCE_DIR}/ExpressionParser.cpp
15-
${CMAKE_CURRENT_SOURCE_DIR}/ElementMap.cpp
16-
${CMAKE_CURRENT_SOURCE_DIR}/ElementNamingUtils.cpp
17-
${CMAKE_CURRENT_SOURCE_DIR}/IndexedName.cpp
18-
${CMAKE_CURRENT_SOURCE_DIR}/License.cpp
19-
${CMAKE_CURRENT_SOURCE_DIR}/MappedElement.cpp
20-
${CMAKE_CURRENT_SOURCE_DIR}/MappedName.cpp
21-
${CMAKE_CURRENT_SOURCE_DIR}/Metadata.cpp
22-
${CMAKE_CURRENT_SOURCE_DIR}/ProjectFile.cpp
23-
${CMAKE_CURRENT_SOURCE_DIR}/Property.cpp
24-
${CMAKE_CURRENT_SOURCE_DIR}/PropertyExpressionEngine.cpp
25-
${CMAKE_CURRENT_SOURCE_DIR}/StringHasher.cpp
26-
${CMAKE_CURRENT_SOURCE_DIR}/VarSet.cpp
27-
${CMAKE_CURRENT_SOURCE_DIR}/VRMLObject.cpp
3+
target_sources(Tests_run PRIVATE
4+
Application.cpp
5+
Branding.cpp
6+
Color.cpp
7+
ComplexGeoData.cpp
8+
Document.cpp
9+
DocumentObject.cpp
10+
DocumentObserver.cpp
11+
Expression.cpp
12+
ExpressionParser.cpp
13+
ElementMap.cpp
14+
ElementNamingUtils.cpp
15+
IndexedName.cpp
16+
License.cpp
17+
MappedElement.cpp
18+
MappedName.cpp
19+
Metadata.cpp
20+
ProjectFile.cpp
21+
Property.cpp
22+
PropertyExpressionEngine.cpp
23+
StringHasher.cpp
24+
VarSet.cpp
25+
VRMLObject.cpp
2826
)

‎tests/src/Base/CMakeLists.txt‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
target_sources(
2-
Tests_run
3-
PRIVATE
4-
${CMAKE_CURRENT_SOURCE_DIR}/Axis.cpp
5-
${CMAKE_CURRENT_SOURCE_DIR}/Base64.cpp
6-
${CMAKE_CURRENT_SOURCE_DIR}/Bitmask.cpp
7-
${CMAKE_CURRENT_SOURCE_DIR}/BoundBox.cpp
8-
${CMAKE_CURRENT_SOURCE_DIR}/Builder3D.cpp
9-
${CMAKE_CURRENT_SOURCE_DIR}/CoordinateSystem.cpp
10-
${CMAKE_CURRENT_SOURCE_DIR}/DualNumber.cpp
11-
${CMAKE_CURRENT_SOURCE_DIR}/DualQuaternion.cpp
12-
${CMAKE_CURRENT_SOURCE_DIR}/Handle.cpp
13-
${CMAKE_CURRENT_SOURCE_DIR}/Matrix.cpp
14-
${CMAKE_CURRENT_SOURCE_DIR}/Parameter.cpp
15-
${CMAKE_CURRENT_SOURCE_DIR}/Placement.cpp
16-
${CMAKE_CURRENT_SOURCE_DIR}/Quantity.cpp
17-
${CMAKE_CURRENT_SOURCE_DIR}/Reader.cpp
18-
${CMAKE_CURRENT_SOURCE_DIR}/Rotation.cpp
19-
${CMAKE_CURRENT_SOURCE_DIR}/ServiceProvider.cpp
20-
${CMAKE_CURRENT_SOURCE_DIR}/Stream.cpp
21-
${CMAKE_CURRENT_SOURCE_DIR}/TimeInfo.cpp
22-
${CMAKE_CURRENT_SOURCE_DIR}/Tools.cpp
23-
${CMAKE_CURRENT_SOURCE_DIR}/Tools2D.cpp
24-
${CMAKE_CURRENT_SOURCE_DIR}/Tools3D.cpp
25-
${CMAKE_CURRENT_SOURCE_DIR}/UniqueNameManager.cpp
26-
${CMAKE_CURRENT_SOURCE_DIR}/Unit.cpp
27-
${CMAKE_CURRENT_SOURCE_DIR}/Vector3D.cpp
28-
${CMAKE_CURRENT_SOURCE_DIR}/ViewProj.cpp
29-
${CMAKE_CURRENT_SOURCE_DIR}/Writer.cpp
1+
target_sources(Tests_run PRIVATE
2+
Axis.cpp
3+
Base64.cpp
4+
Bitmask.cpp
5+
BoundBox.cpp
6+
Builder3D.cpp
7+
CoordinateSystem.cpp
8+
DualNumber.cpp
9+
DualQuaternion.cpp
10+
Handle.cpp
11+
Matrix.cpp
12+
Parameter.cpp
13+
Placement.cpp
14+
Quantity.cpp
15+
Reader.cpp
16+
Rotation.cpp
17+
ServiceProvider.cpp
18+
Stream.cpp
19+
TimeInfo.cpp
20+
Tools.cpp
21+
Tools2D.cpp
22+
Tools3D.cpp
23+
UniqueNameManager.cpp
24+
Unit.cpp
25+
Vector3D.cpp
26+
ViewProj.cpp
27+
Writer.cpp
3028
)
3129

3230
setup_qt_test(InventorBuilder)

‎tests/src/Gui/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Standard C++ GTest tests
2-
target_sources(
3-
Tests_run
4-
PRIVATE
5-
${CMAKE_CURRENT_SOURCE_DIR}/Assistant.cpp
2+
target_sources(Tests_run PRIVATE
3+
Assistant.cpp
64
)
75

86
# Qt tests

‎tests/src/Misc/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
target_sources(
2-
Tests_run
3-
PRIVATE
4-
${CMAKE_CURRENT_SOURCE_DIR}/fmt.cpp
1+
target_sources(Tests_run PRIVATE
2+
fmt.cpp
53
)

‎tests/src/Mod/Assembly/App/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
target_sources(
2-
Assembly_tests_run
3-
PRIVATE
4-
${CMAKE_CURRENT_SOURCE_DIR}/AssemblyObject.cpp
1+
target_sources(Assembly_tests_run PRIVATE
2+
AssemblyObject.cpp
53
)

‎tests/src/Mod/Material/App/CMakeLists.txt‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,33 @@
1-
2-
target_sources(
3-
Material_tests_run
4-
PRIVATE
5-
${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialCards.cpp
6-
${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialFilter.cpp
7-
${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialProperties.cpp
8-
${CMAKE_CURRENT_SOURCE_DIR}/TestMaterials.cpp
9-
${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialValue.cpp
10-
${CMAKE_CURRENT_SOURCE_DIR}/TestModel.cpp
11-
${CMAKE_CURRENT_SOURCE_DIR}/TestModelProperties.cpp
1+
target_sources(Material_tests_run PRIVATE
2+
TestMaterialCards.cpp
3+
TestMaterialFilter.cpp
4+
TestMaterialProperties.cpp
5+
TestMaterials.cpp
6+
TestMaterialValue.cpp
7+
TestModel.cpp
8+
TestModelProperties.cpp
129
)
1310

1411
target_include_directories(Material_tests_run PUBLIC
15-
${QtCore_INCLUDE_DIRS}
12+
${QtCore_INCLUDE_DIRS}
1613
)
1714

1815
set(MaterialTestData_Files
19-
Materials/TestAcrylicLegacy.FCMat
20-
Materials/TestAluminumAppearance.FCMat
21-
Materials/TestAluminumMixed.FCMat
22-
Materials/TestAluminumPhysical.FCMat
23-
Materials/TestBrassAppearance.FCMat
16+
Materials/TestAcrylicLegacy.FCMat
17+
Materials/TestAluminumAppearance.FCMat
18+
Materials/TestAluminumMixed.FCMat
19+
Materials/TestAluminumPhysical.FCMat
20+
Materials/TestBrassAppearance.FCMat
2421
)
2522

2623
ADD_CUSTOM_TARGET(MaterialTestData ALL
27-
SOURCES ${MaterialTestData_Files}
24+
SOURCES ${MaterialTestData_Files}
2825
)
2926

3027
fc_target_copy_resource(MaterialTestData
31-
${CMAKE_CURRENT_SOURCE_DIR}
32-
${CMAKE_BINARY_DIR}/tests
33-
${MaterialTestData_Files})
28+
${CMAKE_CURRENT_SOURCE_DIR}
29+
${CMAKE_BINARY_DIR}/tests
30+
${MaterialTestData_Files})
3431

3532
# INSTALL(
3633
# FILES ${MaterialTest_Files}

‎tests/src/Mod/Measure/App/CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
target_sources(
2-
Measure_tests_run
3-
PRIVATE
4-
${CMAKE_CURRENT_SOURCE_DIR}/MeasureDistance.cpp
1+
target_sources(Measure_tests_run PRIVATE
2+
MeasureDistance.cpp
53
)
64

7-
target_include_directories(
8-
Measure_tests_run
9-
PUBLIC
10-
${CMAKE_BINARY_DIR}
5+
target_include_directories(Measure_tests_run PUBLIC
6+
${CMAKE_BINARY_DIR}
117
)

‎tests/src/Mod/Mesh/App/CMakeLists.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
target_compile_definitions(Mesh_tests_run PRIVATE DATADIR="${CMAKE_SOURCE_DIR}/data")
22

3-
target_sources(
4-
Mesh_tests_run
5-
PRIVATE
6-
${CMAKE_CURRENT_SOURCE_DIR}/Core/KDTree.cpp
7-
${CMAKE_CURRENT_SOURCE_DIR}/Exporter.cpp
8-
${CMAKE_CURRENT_SOURCE_DIR}/Importer.cpp
9-
${CMAKE_CURRENT_SOURCE_DIR}/Mesh.cpp
10-
${CMAKE_CURRENT_SOURCE_DIR}/MeshFeature.cpp
3+
target_sources(Mesh_tests_run PRIVATE
4+
Core/KDTree.cpp
5+
Exporter.cpp
6+
Importer.cpp
7+
Mesh.cpp
8+
MeshFeature.cpp
119
)

‎tests/src/Mod/MeshPart/App/CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
target_sources(
2-
MeshPart_tests_run
3-
PRIVATE
4-
${CMAKE_CURRENT_SOURCE_DIR}/MeshPart.cpp
1+
target_sources(MeshPart_tests_run PRIVATE
2+
MeshPart.cpp
53
)
64

7-
target_include_directories(
8-
MeshPart_tests_run
9-
PUBLIC
10-
${CMAKE_BINARY_DIR}
5+
target_include_directories(MeshPart_tests_run PUBLIC
6+
${CMAKE_BINARY_DIR}
117
)

‎tests/src/Mod/Part/App/CMakeLists.txt‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,45 @@
1-
2-
target_sources(
3-
Part_tests_run
4-
PRIVATE
5-
${CMAKE_CURRENT_SOURCE_DIR}/Attacher.cpp
6-
${CMAKE_CURRENT_SOURCE_DIR}/AttachExtension.cpp
7-
${CMAKE_CURRENT_SOURCE_DIR}/BRepMesh.cpp
8-
${CMAKE_CURRENT_SOURCE_DIR}/FeatureChamfer.cpp
9-
${CMAKE_CURRENT_SOURCE_DIR}/FeatureCompound.cpp
10-
${CMAKE_CURRENT_SOURCE_DIR}/FeatureExtrusion.cpp
11-
${CMAKE_CURRENT_SOURCE_DIR}/FeatureFillet.cpp
12-
${CMAKE_CURRENT_SOURCE_DIR}/FeatureMirroring.cpp
13-
${CMAKE_CURRENT_SOURCE_DIR}/FeatureOffset.cpp
14-
${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartBoolean.cpp
15-
${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartCommon.cpp
16-
${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartCut.cpp
17-
${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartFuse.cpp
18-
${CMAKE_CURRENT_SOURCE_DIR}/FeatureRevolution.cpp
19-
${CMAKE_CURRENT_SOURCE_DIR}/FuzzyBoolean.cpp
20-
${CMAKE_CURRENT_SOURCE_DIR}/Geometry.cpp
21-
${CMAKE_CURRENT_SOURCE_DIR}/PartFeature.cpp
22-
${CMAKE_CURRENT_SOURCE_DIR}/PartFeatures.cpp
23-
${CMAKE_CURRENT_SOURCE_DIR}/PartTestHelpers.cpp
24-
${CMAKE_CURRENT_SOURCE_DIR}/PropertyTopoShape.cpp
25-
${CMAKE_CURRENT_SOURCE_DIR}/TopoDS_Shape.cpp
26-
${CMAKE_CURRENT_SOURCE_DIR}/TopoShape.cpp
27-
${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeCache.cpp
28-
${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeExpansion.cpp
29-
${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMakeElementRefine.cpp
30-
${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMakeShapeWithElementMap.cpp
31-
${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMapper.cpp
32-
${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMakeShape.cpp
33-
${CMAKE_CURRENT_SOURCE_DIR}/WireJoiner.cpp
1+
target_sources(Part_tests_run PRIVATE
2+
Attacher.cpp
3+
AttachExtension.cpp
4+
BRepMesh.cpp
5+
FeatureChamfer.cpp
6+
FeatureCompound.cpp
7+
FeatureExtrusion.cpp
8+
FeatureFillet.cpp
9+
FeatureMirroring.cpp
10+
FeatureOffset.cpp
11+
FeaturePartBoolean.cpp
12+
FeaturePartCommon.cpp
13+
FeaturePartCut.cpp
14+
FeaturePartFuse.cpp
15+
FeatureRevolution.cpp
16+
FuzzyBoolean.cpp
17+
Geometry.cpp
18+
PartFeature.cpp
19+
PartFeatures.cpp
20+
PartTestHelpers.cpp
21+
PropertyTopoShape.cpp
22+
TopoDS_Shape.cpp
23+
TopoShape.cpp
24+
TopoShapeCache.cpp
25+
TopoShapeExpansion.cpp
26+
TopoShapeMakeElementRefine.cpp
27+
TopoShapeMakeShapeWithElementMap.cpp
28+
TopoShapeMapper.cpp
29+
TopoShapeMakeShape.cpp
30+
WireJoiner.cpp
3431
)
3532

3633
set(PartTestData_Files
37-
brepfiles/cylinder1.brep
38-
brepfiles/helix1.brep
34+
brepfiles/cylinder1.brep
35+
brepfiles/helix1.brep
3936
)
4037

4138
ADD_CUSTOM_TARGET(PartTestData ALL
42-
SOURCES ${PartTestData_Files}
39+
SOURCES ${PartTestData_Files}
4340
)
4441

4542
fc_target_copy_resource(PartTestData
46-
${CMAKE_CURRENT_SOURCE_DIR}
47-
${CMAKE_BINARY_DIR}/tests
48-
${PartTestData_Files})
43+
${CMAKE_CURRENT_SOURCE_DIR}
44+
${CMAKE_BINARY_DIR}/tests
45+
${PartTestData_Files})

0 commit comments

Comments
 (0)