Fixed multiple project generation

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
 )
 
-
-
-
-
-

src/Mod/Ship/Icons/CMakeLists.txt

@@ -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
-)
-

src/Mod/Ship/shipCreateShip/CMakeLists.txt

@@ -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
-)
-

src/Mod/Ship/shipOutlineDraw/CMakeLists.txt

@@ -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
-)
-

src/Mod/Ship/shipUtils/CMakeLists.txt

@@ -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
-)
-