diff --git a/tests/src/App/CMakeLists.txt b/tests/src/App/CMakeLists.txt index 369b70a97e..a162d622e6 100644 --- a/tests/src/App/CMakeLists.txt +++ b/tests/src/App/CMakeLists.txt @@ -1,28 +1,26 @@ target_compile_definitions(Tests_run PRIVATE DATADIR="${CMAKE_SOURCE_DIR}/data") -target_sources( - Tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Application.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Branding.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Color.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ComplexGeoData.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Document.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/DocumentObject.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/DocumentObserver.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Expression.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ExpressionParser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ElementMap.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ElementNamingUtils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/IndexedName.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/License.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/MappedElement.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/MappedName.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Metadata.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ProjectFile.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Property.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/PropertyExpressionEngine.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/StringHasher.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/VarSet.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/VRMLObject.cpp +target_sources(Tests_run PRIVATE + Application.cpp + Branding.cpp + Color.cpp + ComplexGeoData.cpp + Document.cpp + DocumentObject.cpp + DocumentObserver.cpp + Expression.cpp + ExpressionParser.cpp + ElementMap.cpp + ElementNamingUtils.cpp + IndexedName.cpp + License.cpp + MappedElement.cpp + MappedName.cpp + Metadata.cpp + ProjectFile.cpp + Property.cpp + PropertyExpressionEngine.cpp + StringHasher.cpp + VarSet.cpp + VRMLObject.cpp ) diff --git a/tests/src/Base/CMakeLists.txt b/tests/src/Base/CMakeLists.txt index 77dafabeb8..531b5ac4c6 100644 --- a/tests/src/Base/CMakeLists.txt +++ b/tests/src/Base/CMakeLists.txt @@ -1,32 +1,30 @@ -target_sources( - Tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Axis.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Base64.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Bitmask.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/BoundBox.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Builder3D.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/CoordinateSystem.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/DualNumber.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/DualQuaternion.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Handle.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Matrix.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Parameter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Placement.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Quantity.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Reader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Rotation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ServiceProvider.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Stream.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TimeInfo.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Tools.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Tools2D.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Tools3D.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/UniqueNameManager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Unit.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Vector3D.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ViewProj.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Writer.cpp +target_sources(Tests_run PRIVATE + Axis.cpp + Base64.cpp + Bitmask.cpp + BoundBox.cpp + Builder3D.cpp + CoordinateSystem.cpp + DualNumber.cpp + DualQuaternion.cpp + Handle.cpp + Matrix.cpp + Parameter.cpp + Placement.cpp + Quantity.cpp + Reader.cpp + Rotation.cpp + ServiceProvider.cpp + Stream.cpp + TimeInfo.cpp + Tools.cpp + Tools2D.cpp + Tools3D.cpp + UniqueNameManager.cpp + Unit.cpp + Vector3D.cpp + ViewProj.cpp + Writer.cpp ) setup_qt_test(InventorBuilder) diff --git a/tests/src/Gui/CMakeLists.txt b/tests/src/Gui/CMakeLists.txt index 5026677829..d507dde3b6 100644 --- a/tests/src/Gui/CMakeLists.txt +++ b/tests/src/Gui/CMakeLists.txt @@ -1,8 +1,6 @@ # Standard C++ GTest tests -target_sources( - Tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Assistant.cpp +target_sources(Tests_run PRIVATE + Assistant.cpp ) # Qt tests diff --git a/tests/src/Misc/CMakeLists.txt b/tests/src/Misc/CMakeLists.txt index 620e993b4e..6688fc7546 100644 --- a/tests/src/Misc/CMakeLists.txt +++ b/tests/src/Misc/CMakeLists.txt @@ -1,5 +1,3 @@ -target_sources( - Tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/fmt.cpp +target_sources(Tests_run PRIVATE + fmt.cpp ) diff --git a/tests/src/Mod/Assembly/App/CMakeLists.txt b/tests/src/Mod/Assembly/App/CMakeLists.txt index 41c6eb9a84..0d4135aff8 100644 --- a/tests/src/Mod/Assembly/App/CMakeLists.txt +++ b/tests/src/Mod/Assembly/App/CMakeLists.txt @@ -1,5 +1,3 @@ -target_sources( - Assembly_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyObject.cpp +target_sources(Assembly_tests_run PRIVATE + AssemblyObject.cpp ) diff --git a/tests/src/Mod/Material/App/CMakeLists.txt b/tests/src/Mod/Material/App/CMakeLists.txt index 53345f1fd7..1d72f944b2 100644 --- a/tests/src/Mod/Material/App/CMakeLists.txt +++ b/tests/src/Mod/Material/App/CMakeLists.txt @@ -1,36 +1,33 @@ - -target_sources( - Material_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialCards.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialFilter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialProperties.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TestMaterials.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TestMaterialValue.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TestModel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TestModelProperties.cpp +target_sources(Material_tests_run PRIVATE + TestMaterialCards.cpp + TestMaterialFilter.cpp + TestMaterialProperties.cpp + TestMaterials.cpp + TestMaterialValue.cpp + TestModel.cpp + TestModelProperties.cpp ) target_include_directories(Material_tests_run PUBLIC - ${QtCore_INCLUDE_DIRS} + ${QtCore_INCLUDE_DIRS} ) set(MaterialTestData_Files - Materials/TestAcrylicLegacy.FCMat - Materials/TestAluminumAppearance.FCMat - Materials/TestAluminumMixed.FCMat - Materials/TestAluminumPhysical.FCMat - Materials/TestBrassAppearance.FCMat + Materials/TestAcrylicLegacy.FCMat + Materials/TestAluminumAppearance.FCMat + Materials/TestAluminumMixed.FCMat + Materials/TestAluminumPhysical.FCMat + Materials/TestBrassAppearance.FCMat ) ADD_CUSTOM_TARGET(MaterialTestData ALL - SOURCES ${MaterialTestData_Files} + SOURCES ${MaterialTestData_Files} ) fc_target_copy_resource(MaterialTestData - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/tests - ${MaterialTestData_Files}) + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/tests + ${MaterialTestData_Files}) # INSTALL( # FILES ${MaterialTest_Files} diff --git a/tests/src/Mod/Measure/App/CMakeLists.txt b/tests/src/Mod/Measure/App/CMakeLists.txt index a66c5b43b3..72857fce11 100644 --- a/tests/src/Mod/Measure/App/CMakeLists.txt +++ b/tests/src/Mod/Measure/App/CMakeLists.txt @@ -1,11 +1,7 @@ -target_sources( - Measure_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/MeasureDistance.cpp +target_sources(Measure_tests_run PRIVATE + MeasureDistance.cpp ) -target_include_directories( - Measure_tests_run - PUBLIC - ${CMAKE_BINARY_DIR} +target_include_directories(Measure_tests_run PUBLIC + ${CMAKE_BINARY_DIR} ) diff --git a/tests/src/Mod/Mesh/App/CMakeLists.txt b/tests/src/Mod/Mesh/App/CMakeLists.txt index 038682f4bb..d90597b62e 100644 --- a/tests/src/Mod/Mesh/App/CMakeLists.txt +++ b/tests/src/Mod/Mesh/App/CMakeLists.txt @@ -1,11 +1,9 @@ target_compile_definitions(Mesh_tests_run PRIVATE DATADIR="${CMAKE_SOURCE_DIR}/data") -target_sources( - Mesh_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Core/KDTree.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Exporter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Importer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Mesh.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/MeshFeature.cpp +target_sources(Mesh_tests_run PRIVATE + Core/KDTree.cpp + Exporter.cpp + Importer.cpp + Mesh.cpp + MeshFeature.cpp ) diff --git a/tests/src/Mod/MeshPart/App/CMakeLists.txt b/tests/src/Mod/MeshPart/App/CMakeLists.txt index 3d2a75e536..f9c003744a 100644 --- a/tests/src/Mod/MeshPart/App/CMakeLists.txt +++ b/tests/src/Mod/MeshPart/App/CMakeLists.txt @@ -1,11 +1,7 @@ -target_sources( - MeshPart_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/MeshPart.cpp +target_sources(MeshPart_tests_run PRIVATE + MeshPart.cpp ) -target_include_directories( - MeshPart_tests_run - PUBLIC - ${CMAKE_BINARY_DIR} +target_include_directories(MeshPart_tests_run PUBLIC + ${CMAKE_BINARY_DIR} ) diff --git a/tests/src/Mod/Part/App/CMakeLists.txt b/tests/src/Mod/Part/App/CMakeLists.txt index 3bc4667b5b..e83ec0c794 100644 --- a/tests/src/Mod/Part/App/CMakeLists.txt +++ b/tests/src/Mod/Part/App/CMakeLists.txt @@ -1,48 +1,45 @@ - -target_sources( - Part_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Attacher.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/AttachExtension.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/BRepMesh.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeatureChamfer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeatureCompound.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeatureExtrusion.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeatureFillet.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeatureMirroring.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeatureOffset.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartBoolean.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartCommon.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartCut.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeaturePartFuse.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FeatureRevolution.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/FuzzyBoolean.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Geometry.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/PartFeature.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/PartFeatures.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/PartTestHelpers.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/PropertyTopoShape.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoDS_Shape.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoShape.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeCache.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeExpansion.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMakeElementRefine.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMakeShapeWithElementMap.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMapper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TopoShapeMakeShape.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/WireJoiner.cpp +target_sources(Part_tests_run PRIVATE + Attacher.cpp + AttachExtension.cpp + BRepMesh.cpp + FeatureChamfer.cpp + FeatureCompound.cpp + FeatureExtrusion.cpp + FeatureFillet.cpp + FeatureMirroring.cpp + FeatureOffset.cpp + FeaturePartBoolean.cpp + FeaturePartCommon.cpp + FeaturePartCut.cpp + FeaturePartFuse.cpp + FeatureRevolution.cpp + FuzzyBoolean.cpp + Geometry.cpp + PartFeature.cpp + PartFeatures.cpp + PartTestHelpers.cpp + PropertyTopoShape.cpp + TopoDS_Shape.cpp + TopoShape.cpp + TopoShapeCache.cpp + TopoShapeExpansion.cpp + TopoShapeMakeElementRefine.cpp + TopoShapeMakeShapeWithElementMap.cpp + TopoShapeMapper.cpp + TopoShapeMakeShape.cpp + WireJoiner.cpp ) set(PartTestData_Files - brepfiles/cylinder1.brep - brepfiles/helix1.brep + brepfiles/cylinder1.brep + brepfiles/helix1.brep ) ADD_CUSTOM_TARGET(PartTestData ALL - SOURCES ${PartTestData_Files} + SOURCES ${PartTestData_Files} ) fc_target_copy_resource(PartTestData - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/tests - ${PartTestData_Files}) + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/tests + ${PartTestData_Files}) diff --git a/tests/src/Mod/PartDesign/App/CMakeLists.txt b/tests/src/Mod/PartDesign/App/CMakeLists.txt index 48583700bc..8a33bc519e 100644 --- a/tests/src/Mod/PartDesign/App/CMakeLists.txt +++ b/tests/src/Mod/PartDesign/App/CMakeLists.txt @@ -1,11 +1,9 @@ -target_sources( - PartDesign_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/BackwardCompatibility.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/DatumPlane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ShapeBinder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Pad.cpp +target_sources(PartDesign_tests_run PRIVATE + BackwardCompatibility.cpp + DatumPlane.cpp + ShapeBinder.cpp + Pad.cpp ) set(PartDesignTestData_Files diff --git a/tests/src/Mod/Points/App/CMakeLists.txt b/tests/src/Mod/Points/App/CMakeLists.txt index bd142d47d5..f0edeee9fa 100644 --- a/tests/src/Mod/Points/App/CMakeLists.txt +++ b/tests/src/Mod/Points/App/CMakeLists.txt @@ -1,6 +1,4 @@ -target_sources( - Points_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Points.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/PointsFeature.cpp +target_sources(Points_tests_run PRIVATE + Points.cpp + PointsFeature.cpp ) diff --git a/tests/src/Mod/Sketcher/App/CMakeLists.txt b/tests/src/Mod/Sketcher/App/CMakeLists.txt index 75dc0501a2..5c4d2660a5 100644 --- a/tests/src/Mod/Sketcher/App/CMakeLists.txt +++ b/tests/src/Mod/Sketcher/App/CMakeLists.txt @@ -1,9 +1,7 @@ -target_sources( - Sketcher_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/SketcherTestHelpers.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/SketchObject.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/SketchObjectChanges.cpp +target_sources(Sketcher_tests_run PRIVATE + SketcherTestHelpers.cpp + SketchObject.cpp + SketchObjectChanges.cpp ) add_subdirectory(planegcs) diff --git a/tests/src/Mod/Sketcher/App/planegcs/CMakeLists.txt b/tests/src/Mod/Sketcher/App/planegcs/CMakeLists.txt index 40d07edb2e..6fe9208a12 100644 --- a/tests/src/Mod/Sketcher/App/planegcs/CMakeLists.txt +++ b/tests/src/Mod/Sketcher/App/planegcs/CMakeLists.txt @@ -1,11 +1,7 @@ -target_sources( - Sketcher_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/GCS.cpp +target_sources(Sketcher_tests_run PRIVATE + GCS.cpp ) -target_sources( - Sketcher_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Constraints.cpp +target_sources(Sketcher_tests_run PRIVATE + Constraints.cpp ) diff --git a/tests/src/Mod/Spreadsheet/App/CMakeLists.txt b/tests/src/Mod/Spreadsheet/App/CMakeLists.txt index 76b1659d6e..4114b51bdf 100644 --- a/tests/src/Mod/Spreadsheet/App/CMakeLists.txt +++ b/tests/src/Mod/Spreadsheet/App/CMakeLists.txt @@ -1,11 +1,7 @@ -target_sources( - Spreadsheet_tests_run - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/PropertySheet.cpp +target_sources(Spreadsheet_tests_run PRIVATE + PropertySheet.cpp ) -target_include_directories( - Spreadsheet_tests_run - PUBLIC +target_include_directories(Spreadsheet_tests_run PUBLIC ${CMAKE_BINARY_DIR} )