From 6d5943dc6e048e9d48554e0e332f2c7fe0fe04ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Luis=20Cerc=C3=B3s=20Pita?= Date: Mon, 2 Jan 2012 15:50:37 +0100 Subject: [PATCH] Fixed errors using CMAKE compile tools --- src/Mod/Ship/Icons/CMakeLists.txt | 66 ++++++++++++-------- src/Mod/Ship/shipCreateShip/CMakeLists.txt | 28 ++++++--- src/Mod/Ship/shipOutlineDraw/CMakeLists.txt | 30 ++++++--- src/Mod/Ship/shipUtils/CMakeLists.txt | 28 ++++++--- src/Mod/Surfaces/Icons/CMakeLists.txt | 50 +++++++++------ src/Mod/Surfaces/surfBorder/CMakeLists.txt | 22 +++++-- src/Mod/Surfaces/surfConvert/CMakeLists.txt | 28 ++++++--- src/Mod/Surfaces/surfISOCurve/CMakeLists.txt | 28 +++++++-- src/Mod/Surfaces/surfSlice/CMakeLists.txt | 28 +++++++-- src/Mod/Surfaces/surfUtils/CMakeLists.txt | 28 +++++++-- 10 files changed, 237 insertions(+), 99 deletions(-) diff --git a/src/Mod/Ship/Icons/CMakeLists.txt b/src/Mod/Ship/Icons/CMakeLists.txt index 3e84c50195..09505795f7 100644 --- a/src/Mod/Ship/Icons/CMakeLists.txt +++ b/src/Mod/Ship/Icons/CMakeLists.txt @@ -1,29 +1,41 @@ -INSTALL( - FILES - 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 - DESTINATION - Mod/Ship/Icons +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 index d03020201b..3c3dd42992 100644 --- a/src/Mod/Ship/shipCreateShip/CMakeLists.txt +++ b/src/Mod/Ship/shipCreateShip/CMakeLists.txt @@ -1,10 +1,22 @@ -INSTALL( - FILES - __init__.py - Preview.py - TaskPanel.py - TaskPanel.ui - DESTINATION - Mod/Ship/shipCreateShip +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 index 0db83ddb7e..e144950f57 100644 --- a/src/Mod/Ship/shipOutlineDraw/CMakeLists.txt +++ b/src/Mod/Ship/shipOutlineDraw/CMakeLists.txt @@ -1,11 +1,23 @@ -INSTALL( - FILES - __init__.py - Plot.py - Preview.py - TaskPanel.py - TaskPanel.ui - DESTINATION - Mod/Ship/shipOutlineDraw +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 index 023e3f867e..696b3c3909 100644 --- a/src/Mod/Ship/shipUtils/CMakeLists.txt +++ b/src/Mod/Ship/shipUtils/CMakeLists.txt @@ -1,10 +1,22 @@ -INSTALL( - FILES - __init__.py - Math.py - Paths.py - Translator.py - DESTINATION - Mod/Ship/shipUtils +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/Icons/CMakeLists.txt b/src/Mod/Surfaces/Icons/CMakeLists.txt index 5f02f4d4a9..7fc12e7820 100644 --- a/src/Mod/Surfaces/Icons/CMakeLists.txt +++ b/src/Mod/Surfaces/Icons/CMakeLists.txt @@ -1,21 +1,33 @@ -INSTALL( - FILES - 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 - DESTINATION - Mod/Surfaces/Icons +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 index fb9e2befe1..d629820b00 100644 --- a/src/Mod/Surfaces/surfBorder/CMakeLists.txt +++ b/src/Mod/Surfaces/surfBorder/CMakeLists.txt @@ -1,7 +1,19 @@ -INSTALL( - FILES - __init__.py - DESTINATION - Mod/Surfaces/surfBorder +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 index 2bd1f7e58e..c5e204b82a 100644 --- a/src/Mod/Surfaces/surfConvert/CMakeLists.txt +++ b/src/Mod/Surfaces/surfConvert/CMakeLists.txt @@ -1,10 +1,22 @@ -INSTALL( - FILES - __init__.py - Preview.py - TaskPanel.py - TaskPanel.ui - DESTINATION - Mod/Surfaces/surfConvert +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 index 21445ed821..3c12675ddf 100644 --- a/src/Mod/Surfaces/surfISOCurve/CMakeLists.txt +++ b/src/Mod/Surfaces/surfISOCurve/CMakeLists.txt @@ -1,10 +1,28 @@ +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 - __init__.py - PointTracker.py - TaskPanel.py - Preview.py - TaskPanel.ui DESTINATION Mod/Surfaces/surfISOCurve ) diff --git a/src/Mod/Surfaces/surfSlice/CMakeLists.txt b/src/Mod/Surfaces/surfSlice/CMakeLists.txt index 7757f84eac..28a2b6ffa1 100644 --- a/src/Mod/Surfaces/surfSlice/CMakeLists.txt +++ b/src/Mod/Surfaces/surfSlice/CMakeLists.txt @@ -1,10 +1,28 @@ +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 - __init__.py - PointTracker.py - TaskPanel.py - Preview.py - TaskPanel.ui DESTINATION Mod/Surfaces/surfSlice ) diff --git a/src/Mod/Surfaces/surfUtils/CMakeLists.txt b/src/Mod/Surfaces/surfUtils/CMakeLists.txt index 46ceac9efc..c38e9b10f4 100644 --- a/src/Mod/Surfaces/surfUtils/CMakeLists.txt +++ b/src/Mod/Surfaces/surfUtils/CMakeLists.txt @@ -1,10 +1,28 @@ +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 - __init__.py - Geometry.py - Math.py - Paths.py - Translator.py DESTINATION Mod/Surfaces/surfUtils )