diff --git a/src/Mod/Ship/CMakeLists.txt b/src/Mod/Ship/CMakeLists.txt index dc695ee5c..e446440ef 100644 --- a/src/Mod/Ship/CMakeLists.txt +++ b/src/Mod/Ship/CMakeLists.txt @@ -1,16 +1,63 @@ -add_subdirectory(Icons) -add_subdirectory(shipCreateShip) -add_subdirectory(shipOutlineDraw) -add_subdirectory(shipUtils) - -SET(Ship_SRCS - InitGui.py - ShipGui.py - Instance.py +SET(ShipMain_SRCS + InitGui.py + ShipGui.py + Instance.py ) -SOURCE_GROUP("" FILES ${Ship_SRCS}) +SOURCE_GROUP("" FILES ${ShipMain_SRCS}) -SET(all_files ${Ship_SRCS}) +SET(ShipIcons_SRCS + Icons/AreaCurveIco.png + Icons/AreaCurveIco.xcf + Icons/AreaCurveIco.xpm + Icons/DataIco.png + Icons/DataIco.xcf + Icons/DataIco.xpm + Icons/DiscretizeIco.png + Icons/DiscretizeIco.xcf + Icons/DiscretizeIco.xpm + Icons/HydrostaticsIco.png + Icons/HydrostaticsIco.xcf + Icons/HydrostaticsIco.xpm + Icons/Ico.png + Icons/Ico.xcf + Icons/Ico.xpm + Icons/OutlineDrawIco.png + Icons/OutlineDrawIco.xcf + Icons/OutlineDrawIco.xpm + Icons/ReparametrizeIco.png + Icons/ReparametrizeIco.xcf + Icons/ReparametrizeIco.xpm + Icons/Ship.xcf + Icons/Ship.xpm +) +SOURCE_GROUP("shipicons" FILES ${ShipIcons_SRCS}) + +SET(ShipCreateShip_SRCS + shipCreateShip/__init__.py + shipCreateShip/Preview.py + shipCreateShip/TaskPanel.py + shipCreateShip/TaskPanel.ui +) +SOURCE_GROUP("shipcreateship" FILES ${ShipCreateShip_SRCS}) + +SET(ShipOutlineDraw_SRCS + shipOutlineDraw/__init__.py + shipOutlineDraw/Plot.py + shipOutlineDraw/Preview.py + shipOutlineDraw/TaskPanel.py + shipOutlineDraw/TaskPanel.ui +) +SOURCE_GROUP("shipoutlinedraw" FILES ${ShipOutlineDraw_SRCS}) + +SET(ShipUtils_SRCS + shipUtils/__init__.py + shipUtils/Math.py + shipUtils/Paths.py + shipUtils/Translator.py +) +SOURCE_GROUP("shiputils" FILES ${ShipUtils_SRCS}) + +SET(all_files ${ShipMain_SRCS} ${ShipIcons_SRCS} ${ShipCreateShip_SRCS} ${ShipOutlineDraw_SRCS} ${ShipUtils_SRCS}) ADD_CUSTOM_TARGET(Ship ALL SOURCES ${all_files} @@ -20,14 +67,32 @@ fc_copy_sources("Mod/Ship" "Ship" ${all_files}) INSTALL( FILES - ${Ship_SRCS} - README + ${ShipIcons_SRCS} DESTINATION - Mod/Ship + Mod/Ship/Icons +) +INSTALL( + FILES + ${ShipCreateShip_SRCS} + DESTINATION + Mod/Ship/shipCreateShip +) +INSTALL( + FILES + ${ShipOutlineDraw_SRCS} + DESTINATION + Mod/Ship/shipOutlineDraw +) +INSTALL( + FILES + ${ShipUtils_SRCS} + DESTINATION + Mod/Ship/shipUtils +) +INSTALL( + FILES + ${ShipMain_SRCS} + DESTINATION + Mod/Ship ) - - - - - diff --git a/src/Mod/Ship/Icons/CMakeLists.txt b/src/Mod/Ship/Icons/CMakeLists.txt deleted file mode 100644 index 09505795f..000000000 --- a/src/Mod/Ship/Icons/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -SET(Ship_Icons - AreaCurveIco.png - AreaCurveIco.xcf - AreaCurveIco.xpm - DataIco.png - DataIco.xcf - DataIco.xpm - DiscretizeIco.png - DiscretizeIco.xcf - DiscretizeIco.xpm - HydrostaticsIco.png - HydrostaticsIco.xcf - HydrostaticsIco.xpm - Ico.png - Ico.xcf - Ico.xpm - OutlineDrawIco.png - OutlineDrawIco.xcf - OutlineDrawIco.xpm - ReparametrizeIco.png - ReparametrizeIco.xcf - ReparametrizeIco.xpm - Ship.xcf - Ship.xpm -) - -SOURCE_GROUP("" FILES ${Ship_Icons}) - -ADD_CUSTOM_TARGET(ShipIcons ALL - SOURCES ${Ship_Icons} -) - -fc_copy_sources("Mod/Ship/Icons" "Ship/Icons" ${Ship_Icons}) - -INSTALL( - FILES - ${Ship_Icons} - DESTINATION - Mod/Ship/Icons -) - diff --git a/src/Mod/Ship/shipCreateShip/CMakeLists.txt b/src/Mod/Ship/shipCreateShip/CMakeLists.txt deleted file mode 100644 index 3c3dd4299..000000000 --- a/src/Mod/Ship/shipCreateShip/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -SET(Ship_CreateShip - __init__.py - Preview.py - TaskPanel.py - TaskPanel.ui -) - -SOURCE_GROUP("" FILES ${Ship_CreateShip}) - -ADD_CUSTOM_TARGET(ShipCreateShip ALL - SOURCES ${Ship_CreateShip} -) - -fc_copy_sources("Mod/Ship/shipCreateShip" "Ship/shipCreateShip" ${Ship_CreateShip}) - -INSTALL( - FILES - ${Ship_CreateShip} - DESTINATION - Mod/Ship/shipCreateShip -) - diff --git a/src/Mod/Ship/shipOutlineDraw/CMakeLists.txt b/src/Mod/Ship/shipOutlineDraw/CMakeLists.txt deleted file mode 100644 index e144950f5..000000000 --- a/src/Mod/Ship/shipOutlineDraw/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -SET(Ship_OutlineDraw - __init__.py - Plot.py - Preview.py - TaskPanel.py - TaskPanel.ui -) - -SOURCE_GROUP("" FILES ${Ship_OutlineDraw}) - -ADD_CUSTOM_TARGET(ShipOutlineDraw ALL - SOURCES ${Ship_OutlineDraw} -) - -fc_copy_sources("Mod/Ship/shipOutlineDraw" "Ship/shipOutlineDraw" ${Ship_OutlineDraw}) - -INSTALL( - FILES - ${Ship_OutlineDraw} - DESTINATION - Mod/Ship/shipOutlineDraw -) - diff --git a/src/Mod/Ship/shipUtils/CMakeLists.txt b/src/Mod/Ship/shipUtils/CMakeLists.txt deleted file mode 100644 index 696b3c390..000000000 --- a/src/Mod/Ship/shipUtils/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -SET(Ship_Utils - __init__.py - Math.py - Paths.py - Translator.py -) - -SOURCE_GROUP("" FILES ${Ship_Utils}) - -ADD_CUSTOM_TARGET(ShipUtils ALL - SOURCES ${Ship_Utils} -) - -fc_copy_sources("Mod/Ship/shipUtils" "Ship/shipUtils" ${Ship_Utils}) - -INSTALL( - FILES - ${Ship_Utils} - DESTINATION - Mod/Ship/shipUtils -) - diff --git a/src/Mod/Surfaces/CMakeLists.txt b/src/Mod/Surfaces/CMakeLists.txt index 528481619..edf782c51 100644 --- a/src/Mod/Surfaces/CMakeLists.txt +++ b/src/Mod/Surfaces/CMakeLists.txt @@ -1,18 +1,69 @@ -add_subdirectory(Icons) -add_subdirectory(surfBorder) -add_subdirectory(surfConvert) -add_subdirectory(surfISOCurve) -add_subdirectory(surfSlice) -add_subdirectory(surfUtils) - - -SET(Surfaces_SRCS - InitGui.py - SurfGui.py +SET(SurfMain_SRCS + InitGui.py + SurfGui.py ) -SOURCE_GROUP("" FILES ${Surfaces_SRCS}) +SOURCE_GROUP("" FILES ${SurfMain_SRCS}) -SET(all_files ${Surfaces_SRCS}) +SET(SurfIcons_SRCS + Icons/BorderIco.png + Icons/BorderIco.xpm + Icons/ConvertIco.png + Icons/ConvertTo4SidesIco.xpm + Icons/Ico.xcf + Icons/IsoCurveIco.png + Icons/IsoCurveIco.xpm + Icons/SliceIco.xcf + Icons/BorderIco.xcf + Icons/ConvertIco.xcf + Icons/Ico.png + Icons/Ico.xpm + Icons/IsoCurveIco.xcf + Icons/SliceIco.png + Icons/SliceIco.xpm +) +SOURCE_GROUP("surficons" FILES ${SurfIcons_SRCS}) + +SET(SurfBorder_SRCS + surfBorder/__init__.py +) +SOURCE_GROUP("surfborder" FILES ${SurfBorder_SRCS}) + +SET(SurfConvert_SRCS + surfConvert/__init__.py + surfConvert/Preview.py + surfConvert/TaskPanel.py + surfConvert/TaskPanel.ui +) +SOURCE_GROUP("surfconvert" FILES ${SurfConvert_SRCS}) + +SET(SurfISOCurve_SRCS + surfISOCurve/__init__.py + surfISOCurve/PointTracker.py + surfISOCurve/TaskPanel.py + surfISOCurve/Preview.py + surfISOCurve/TaskPanel.ui +) +SOURCE_GROUP("surfISOcurve" FILES ${SurfISOCurve_SRCS}) + +SET(SurfSlice_SRCS + surfSlice/__init__.py + surfSlice/PointTracker.py + surfSlice/TaskPanel.py + surfSlice/Preview.py + surfSlice/TaskPanel.ui +) +SOURCE_GROUP("surfslice" FILES ${SurfSlice_SRCS}) + +SET(SurfUtils_SRCS + surfUtils/__init__.py + surfUtils/Geometry.py + surfUtils/Math.py + surfUtils/Paths.py + surfUtils/Translator.py +) +SOURCE_GROUP("surfutils" FILES ${SurfUtils_SRCS}) + +SET(all_files ${SurfMain_SRCS} ${SurfIcons_SRCS} ${SurfBorder_SRCS} ${SurfConvert_SRCS} ${SurfISOCurve_SRCS} ${SurfSlice_SRCS} ${SurfUtils_SRCS}) ADD_CUSTOM_TARGET(Surfaces ALL SOURCES ${all_files} @@ -22,9 +73,44 @@ fc_copy_sources("Mod/Surfaces" "Surfaces" ${all_files}) INSTALL( FILES - ${Surfaces_SRCS} - README + ${SurfIcons_SRCS} DESTINATION - Mod/Surfaces + Mod/Surfaces/Icons +) +INSTALL( + FILES + ${SurfBorder_SRCS} + DESTINATION + Mod/Surfaces/surfBorder +) +INSTALL( + FILES + ${SurfConvert_SRCS} + DESTINATION + Mod/Surfaces/surfConvert +) +INSTALL( + FILES + ${SurfISOCurve_SRCS} + DESTINATION + Mod/Surfaces/surfISOCurve +) +INSTALL( + FILES + ${SurfSlice_SRCS} + DESTINATION + Mod/Surfaces/surfSlice +) +INSTALL( + FILES + ${SurfUtils_SRCS} + DESTINATION + Mod/Surfaces/surfUtils +) +INSTALL( + FILES + ${SurfMain_SRCS} + DESTINATION + Mod/Surfaces ) diff --git a/src/Mod/Surfaces/Icons/CMakeLists.txt b/src/Mod/Surfaces/Icons/CMakeLists.txt deleted file mode 100644 index 7fc12e782..000000000 --- a/src/Mod/Surfaces/Icons/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -SET(Surfaces_Icons - BorderIco.png - BorderIco.xpm - ConvertIco.png - ConvertTo4SidesIco.xpm - Ico.xcf - IsoCurveIco.png - IsoCurveIco.xpm - SliceIco.xcf - BorderIco.xcf - ConvertIco.xcf - Ico.png - Ico.xpm - IsoCurveIco.xcf - SliceIco.png - SliceIco.xpm -) - -SOURCE_GROUP("" FILES ${Surfaces_Icons}) - -ADD_CUSTOM_TARGET(SurfacesIcons ALL - SOURCES ${Surfaces_Icons} -) - -fc_copy_sources("Mod/Surfaces/Icons" "Surfaces/Icons" ${Surfaces_Icons}) - -INSTALL( - FILES - ${Surfaces_Icons} - DESTINATION - Mod/Surfaces/Icons -) - diff --git a/src/Mod/Surfaces/surfBorder/CMakeLists.txt b/src/Mod/Surfaces/surfBorder/CMakeLists.txt deleted file mode 100644 index d629820b0..000000000 --- a/src/Mod/Surfaces/surfBorder/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -SET(Surfaces_Border - __init__.py -) - -SOURCE_GROUP("" FILES ${Surfaces_Border}) - -ADD_CUSTOM_TARGET(SurfacesBorder ALL - SOURCES ${Surfaces_Border} -) - -fc_copy_sources("Mod/Surfaces/surfBorder" "Surfaces/surfBorder" ${Surfaces_Border}) - -INSTALL( - FILES - ${Surfaces_Border} - DESTINATION - Mod/Surfaces/surfBorder -) - diff --git a/src/Mod/Surfaces/surfConvert/CMakeLists.txt b/src/Mod/Surfaces/surfConvert/CMakeLists.txt deleted file mode 100644 index c5e204b82..000000000 --- a/src/Mod/Surfaces/surfConvert/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -SET(Surfaces_Convert - __init__.py - Preview.py - TaskPanel.py - TaskPanel.ui -) - -SOURCE_GROUP("" FILES ${Surfaces_Convert}) - -ADD_CUSTOM_TARGET(SurfacesConvert ALL - SOURCES ${Surfaces_Convert} -) - -fc_copy_sources("Mod/Surfaces/surfConvert" "Surfaces/surfConvert" ${Surfaces_Convert}) - -INSTALL( - FILES - ${Surfaces_Convert} - DESTINATION - Mod/Surfaces/surfConvert -) - diff --git a/src/Mod/Surfaces/surfISOCurve/CMakeLists.txt b/src/Mod/Surfaces/surfISOCurve/CMakeLists.txt deleted file mode 100644 index 3c12675dd..000000000 --- a/src/Mod/Surfaces/surfISOCurve/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -SET(Surfaces_ISOCurve - __init__.py - PointTracker.py - TaskPanel.py - Preview.py - TaskPanel.ui -) - -SOURCE_GROUP("" FILES ${Surfaces_ISOCurve}) - -ADD_CUSTOM_TARGET(SurfacesISOCurve ALL - SOURCES ${Surfaces_ISOCurve} -) - -fc_copy_sources("Mod/Surfaces/surfISOCurve" "Surfaces/surfISOCurve" ${Surfaces_ISOCurve}) - -INSTALL( - FILES - ${Surfaces_ISOCurve} - DESTINATION - Mod/Surfaces/surfISOCurve -) - -INSTALL( - FILES - DESTINATION - Mod/Surfaces/surfISOCurve -) - diff --git a/src/Mod/Surfaces/surfSlice/CMakeLists.txt b/src/Mod/Surfaces/surfSlice/CMakeLists.txt deleted file mode 100644 index 28a2b6ffa..000000000 --- a/src/Mod/Surfaces/surfSlice/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -SET(Surfaces_Slice - __init__.py - PointTracker.py - TaskPanel.py - Preview.py - TaskPanel.ui -) - -SOURCE_GROUP("" FILES ${Surfaces_Slice}) - -ADD_CUSTOM_TARGET(SurfacesSlice ALL - SOURCES ${Surfaces_Slice} -) - -fc_copy_sources("Mod/Surfaces/surfSlice" "Surfaces/surfSlice" ${Surfaces_Slice}) - -INSTALL( - FILES - ${Surfaces_Slice} - DESTINATION - Mod/Surfaces/surfSlice -) - -INSTALL( - FILES - DESTINATION - Mod/Surfaces/surfSlice -) - diff --git a/src/Mod/Surfaces/surfUtils/CMakeLists.txt b/src/Mod/Surfaces/surfUtils/CMakeLists.txt deleted file mode 100644 index c38e9b10f..000000000 --- a/src/Mod/Surfaces/surfUtils/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -SET(Surfaces_Utils - __init__.py - Geometry.py - Math.py - Paths.py - Translator.py -) - -SOURCE_GROUP("" FILES ${Surfaces_Utils}) - -ADD_CUSTOM_TARGET(SurfacesUtils ALL - SOURCES ${Surfaces_Utils} -) - -fc_copy_sources("Mod/Surfaces/surfUtils" "Surfaces/surfUtils" ${Surfaces_Utils}) - -INSTALL( - FILES - ${Surfaces_Utils} - DESTINATION - Mod/Surfaces/surfUtils -) - -INSTALL( - FILES - DESTINATION - Mod/Surfaces/surfUtils -) -