From 53c1eaeba1aa3acf82281488af46021ac9440aff Mon Sep 17 00:00:00 2001 From: Bob Burrough Date: Sat, 6 Feb 2016 11:59:26 -0800 Subject: [PATCH] Revert "Cmake files qtcreator" --- CMakeLists.txt | 7 --- cura/CMakeLists.txt | 21 -------- icons/CMakeLists.txt | 8 --- plugins/3MFReader/CMakeLists.txt | 4 -- plugins/CMakeLists.txt | 13 ----- plugins/ChangeLogPlugin/CMakeLists.txt | 6 --- plugins/CuraEngineBackend/CMakeLists.txt | 8 --- plugins/GCodeReader/CMakeLists.txt | 3 -- plugins/GCodeWriter/CMakeLists.txt | 4 -- plugins/LayerView/CMakeLists.txt | 6 --- plugins/PerObjectSettingsTool/CMakeLists.txt | 7 --- .../RemovableDriveOutputDevice/CMakeLists.txt | 8 --- plugins/SliceInfoPlugin/CMakeLists.txt | 4 -- plugins/SolidView/CMakeLists.txt | 4 -- plugins/USBPrinting/CMakeLists.txt | 9 ---- plugins/USBPrinting/avr_isp/CMakeLists.txt | 9 ---- plugins/XRayView/CMakeLists.txt | 9 ---- plugins/XRayView/avr_isp/CMakeLists.txt | 1 - resources/CMakeLists.txt | 9 ---- resources/i18n/CMakeLists.txt | 6 --- resources/images/CMakeLists.txt | 9 ---- resources/machines/CMakeLists.txt | 2 - resources/meshes/CMakeLists.txt | 2 - resources/profiles/CMakeLists.txt | 2 - resources/qml/CMakeLists.txt | 18 ------- resources/qml/WizardPages/CMakeLists.txt | 7 --- resources/settings/CMakeLists.txt | 2 - resources/shaders/CMakeLists.txt | 2 - resources/themes/CMakeLists.txt | 4 -- resources/themes/cura/CMakeLists.txt | 6 --- resources/themes/cura/icons/CMakeLists.txt | 54 ------------------- 31 files changed, 254 deletions(-) delete mode 100644 cura/CMakeLists.txt delete mode 100644 icons/CMakeLists.txt delete mode 100644 plugins/3MFReader/CMakeLists.txt delete mode 100644 plugins/CMakeLists.txt delete mode 100644 plugins/ChangeLogPlugin/CMakeLists.txt delete mode 100644 plugins/CuraEngineBackend/CMakeLists.txt delete mode 100644 plugins/GCodeReader/CMakeLists.txt delete mode 100644 plugins/GCodeWriter/CMakeLists.txt delete mode 100644 plugins/LayerView/CMakeLists.txt delete mode 100644 plugins/PerObjectSettingsTool/CMakeLists.txt delete mode 100644 plugins/RemovableDriveOutputDevice/CMakeLists.txt delete mode 100644 plugins/SliceInfoPlugin/CMakeLists.txt delete mode 100644 plugins/SolidView/CMakeLists.txt delete mode 100644 plugins/USBPrinting/CMakeLists.txt delete mode 100644 plugins/USBPrinting/avr_isp/CMakeLists.txt delete mode 100644 plugins/XRayView/CMakeLists.txt delete mode 100644 plugins/XRayView/avr_isp/CMakeLists.txt delete mode 100644 resources/CMakeLists.txt delete mode 100644 resources/i18n/CMakeLists.txt delete mode 100644 resources/images/CMakeLists.txt delete mode 100644 resources/machines/CMakeLists.txt delete mode 100644 resources/meshes/CMakeLists.txt delete mode 100644 resources/profiles/CMakeLists.txt delete mode 100644 resources/qml/CMakeLists.txt delete mode 100644 resources/qml/WizardPages/CMakeLists.txt delete mode 100644 resources/settings/CMakeLists.txt delete mode 100644 resources/shaders/CMakeLists.txt delete mode 100644 resources/themes/CMakeLists.txt delete mode 100644 resources/themes/cura/CMakeLists.txt delete mode 100644 resources/themes/cura/icons/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f4989b5a6..9384c58ff4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,13 +4,6 @@ cmake_minimum_required(VERSION 2.8.12) include(GNUInstallDirs) -#################### -subdirs( cura ) -subdirs( icons ) -subdirs( plugins ) -subdirs( resources) -#################### - set(URANIUM_SCRIPTS_DIR "${CMAKE_SOURCE_DIR}/../uranium/scripts" CACHE DIRECTORY "The location of the scripts directory of the Uranium repository") set(CURA_VERSION "master" CACHE STRING "Version name of Cura") diff --git a/cura/CMakeLists.txt b/cura/CMakeLists.txt deleted file mode 100644 index 3e9d89c2eb..0000000000 --- a/cura/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -add_custom_target( cura SOURCES - BuildVolume.py - CameraAnimation.py - ConvexHullDecorator.py - ConvexHullJob.py - ConvexHullNode.py - CrashHandler.py - CuraActions.py - CuraApplication.py - CuraSplashScreen.py - CuraVersion.py.in - __init__.py - LayerData.py - LayerDataDecorator.py - MultiMaterialDecorator.py - OneAtATimeIterator.py - PlatformPhysics.py - PlatformPhysicsOperation.py - PrintInformation.py - ZOffsetDecorator.py -) diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt deleted file mode 100644 index 57e34cf6cf..0000000000 --- a/icons/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_custom_target( icons SOURCES - cura.icns - cura.ico - cura-32.png - cura-48.png - cura-64.png - cura-128.png -) diff --git a/plugins/3MFReader/CMakeLists.txt b/plugins/3MFReader/CMakeLists.txt deleted file mode 100644 index 618c6428cf..0000000000 --- a/plugins/3MFReader/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_custom_target( ThreeMFReader SOURCES - __init__.py - ThreeMFReader.py -) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt deleted file mode 100644 index 697b739466..0000000000 --- a/plugins/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ - -subdirs( 3MFReader ) -subdirs( ChangeLogPlugin ) -subdirs( CuraEngineBackend ) -subdirs( GCodeReader ) -subdirs( GCodeWriter ) -subdirs( LayerView ) -subdirs( PerObjectSettingsTool ) -subdirs( RemovableDriveOutputDevice ) -subdirs( SliceInfoPlugin ) -subdirs( SolidView ) -subdirs( USBPrinting ) -subdirs( XRayView ) diff --git a/plugins/ChangeLogPlugin/CMakeLists.txt b/plugins/ChangeLogPlugin/CMakeLists.txt deleted file mode 100644 index 13e552f360..0000000000 --- a/plugins/ChangeLogPlugin/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_custom_target( ChangeLog SOURCES - __init__.py - ChangeLog.py - ChangeLog.txt - ChangeLog.qml -) diff --git a/plugins/CuraEngineBackend/CMakeLists.txt b/plugins/CuraEngineBackend/CMakeLists.txt deleted file mode 100644 index bc22d1fb9b..0000000000 --- a/plugins/CuraEngineBackend/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_custom_target( CuraEngineBackend SOURCES - __init__.py - CuraEngineBackend.py - Cura_pb2.py - ProcessGCodeJob.py - ProcessSlicedObjectListJob.py - StartSliceJob.py -) diff --git a/plugins/GCodeReader/CMakeLists.txt b/plugins/GCodeReader/CMakeLists.txt deleted file mode 100644 index f903641924..0000000000 --- a/plugins/GCodeReader/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_custom_target( GCodeReader SOURCES - -) diff --git a/plugins/GCodeWriter/CMakeLists.txt b/plugins/GCodeWriter/CMakeLists.txt deleted file mode 100644 index 0adb073fb2..0000000000 --- a/plugins/GCodeWriter/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_custom_target( GCodeWriter SOURCES - __init__.py - GCodeWriter.py -) diff --git a/plugins/LayerView/CMakeLists.txt b/plugins/LayerView/CMakeLists.txt deleted file mode 100644 index 67296bd81e..0000000000 --- a/plugins/LayerView/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_custom_target( LayerView SOURCES - __init__.py - LayerView.py - LayerView.qml - LayerViewProxy.py -) diff --git a/plugins/PerObjectSettingsTool/CMakeLists.txt b/plugins/PerObjectSettingsTool/CMakeLists.txt deleted file mode 100644 index 43d1d7cea8..0000000000 --- a/plugins/PerObjectSettingsTool/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_custom_target( PerObjectSettingsTool SOURCES - __init__.py - PerObjectSettingsModel.py - PerObjectSettingsPanel.qml - PerObjectSettingsTool.py - SettingOverrideModel.py -) diff --git a/plugins/RemovableDriveOutputDevice/CMakeLists.txt b/plugins/RemovableDriveOutputDevice/CMakeLists.txt deleted file mode 100644 index 8c7300f142..0000000000 --- a/plugins/RemovableDriveOutputDevice/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_custom_target( RemovableDriveOutputDevice SOURCES - __init__.py - LinuxRemovableDrivePlugin.py - OSXRemovableDrivePlugin.py - RemovableDriveOutputDevice.py - RemovableDrivePlugin.py - WindowsRemovableDrivePlugin.py -) diff --git a/plugins/SliceInfoPlugin/CMakeLists.txt b/plugins/SliceInfoPlugin/CMakeLists.txt deleted file mode 100644 index 45c9b2e906..0000000000 --- a/plugins/SliceInfoPlugin/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_custom_target( SliceInfoPlugin SOURCES - __init__.py - SliceInfo.py -) diff --git a/plugins/SolidView/CMakeLists.txt b/plugins/SolidView/CMakeLists.txt deleted file mode 100644 index bfd8cf4bab..0000000000 --- a/plugins/SolidView/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_custom_target( SolidView SOURCES - __init__.py - SolidView.py -) diff --git a/plugins/USBPrinting/CMakeLists.txt b/plugins/USBPrinting/CMakeLists.txt deleted file mode 100644 index 715eb8530b..0000000000 --- a/plugins/USBPrinting/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_custom_target( USBPrinting SOURCES - __init__.py - ControlWindow.qml - FirmwareUpdateWindow.qml - PrinterConnection.py - USBPrinterManager.py -) - - diff --git a/plugins/USBPrinting/avr_isp/CMakeLists.txt b/plugins/USBPrinting/avr_isp/CMakeLists.txt deleted file mode 100644 index 1c5963b134..0000000000 --- a/plugins/USBPrinting/avr_isp/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_custom_target( avr_isp SOURCES - __init__.py - chipDB.py - intelHex.py - ispBase.py - stk500v2.py -) - - diff --git a/plugins/XRayView/CMakeLists.txt b/plugins/XRayView/CMakeLists.txt deleted file mode 100644 index 7cd0d3b8ea..0000000000 --- a/plugins/XRayView/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_custom_target( XRayView SOURCES - __init__.py - xray.shader - xray_composite.shader - XRayPass.py - XRayView.py -) - -subdirs( avr_isp ) diff --git a/plugins/XRayView/avr_isp/CMakeLists.txt b/plugins/XRayView/avr_isp/CMakeLists.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/plugins/XRayView/avr_isp/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt deleted file mode 100644 index e9f03b19ae..0000000000 --- a/resources/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -subdirs( i18n ) -subdirs( images ) -subdirs( machines ) -subdirs( meshes ) -subdirs( profiles ) -subdirs( qml ) -subdirs( settings ) -subdirs( shaders ) -subdirs( themes ) diff --git a/resources/i18n/CMakeLists.txt b/resources/i18n/CMakeLists.txt deleted file mode 100644 index 5d391fc93e..0000000000 --- a/resources/i18n/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_custom_target( i18n SOURCES - cura.pot - fdmprinter.json.pot -) - -subdirs( en ) diff --git a/resources/images/CMakeLists.txt b/resources/images/CMakeLists.txt deleted file mode 100644 index 79d85ec3df..0000000000 --- a/resources/images/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -add_custom_target( images SOURCES - cura.png - cura-icon.png - MakerStarterbackplate.png - Ultimaker2backplate.png - Ultimaker2Extendedbackplate.png - Ultimaker2Gobackplate.png - UltimakerPlusbackplate.png -) diff --git a/resources/machines/CMakeLists.txt b/resources/machines/CMakeLists.txt deleted file mode 100644 index 8d89436dc9..0000000000 --- a/resources/machines/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_custom_target( machines SOURCES -) diff --git a/resources/meshes/CMakeLists.txt b/resources/meshes/CMakeLists.txt deleted file mode 100644 index c9625e24c4..0000000000 --- a/resources/meshes/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_custom_target( meshes SOURCES -) diff --git a/resources/profiles/CMakeLists.txt b/resources/profiles/CMakeLists.txt deleted file mode 100644 index a18616c389..0000000000 --- a/resources/profiles/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_custom_target( profiles SOURCES -) diff --git a/resources/qml/CMakeLists.txt b/resources/qml/CMakeLists.txt deleted file mode 100644 index 2a4cf7ca74..0000000000 --- a/resources/qml/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_custom_target( qml SOURCES - AboutDialog.qml - Actions.qml - AddMachineWizard.qml - Cura.qml - EngineLog.qml - GeneralPage.qml - JobSpecs.qml - ProfileSetup.qml - SaveButton.qml - Sidebar.qml - SidebarAdvanced.qml - SidebarHeader.qml - SidebarSimple.qml - SidebarTooltip.qml - Toolbar.qml - Toolbar.qml -) diff --git a/resources/qml/WizardPages/CMakeLists.txt b/resources/qml/WizardPages/CMakeLists.txt deleted file mode 100644 index f05d414dac..0000000000 --- a/resources/qml/WizardPages/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_custom_target( WizardPages SOURCES - AddMachine.qml - Bedleveling.qml - SelectUpgradedParts.qml - UltimakerCheckup.qml - UpgradeFirmware.qml -) diff --git a/resources/settings/CMakeLists.txt b/resources/settings/CMakeLists.txt deleted file mode 100644 index a0273028bf..0000000000 --- a/resources/settings/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_custom_target( settings SOURCES -) diff --git a/resources/shaders/CMakeLists.txt b/resources/shaders/CMakeLists.txt deleted file mode 100644 index e84a4810ec..0000000000 --- a/resources/shaders/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_custom_target( shaders SOURCES -) diff --git a/resources/themes/CMakeLists.txt b/resources/themes/CMakeLists.txt deleted file mode 100644 index c306fe5240..0000000000 --- a/resources/themes/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_custom_target( themes SOURCES -) - -subdirs( cura ) diff --git a/resources/themes/cura/CMakeLists.txt b/resources/themes/cura/CMakeLists.txt deleted file mode 100644 index 1eea58c7aa..0000000000 --- a/resources/themes/cura/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_custom_target( themes_cura SOURCES - styles.qml - theme.json -) - -subdirs( icons ) diff --git a/resources/themes/cura/icons/CMakeLists.txt b/resources/themes/cura/icons/CMakeLists.txt deleted file mode 100644 index 8c56fdafa0..0000000000 --- a/resources/themes/cura/icons/CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ -add_custom_target( themes_cura_icons SOURCES - application.svg - arrow_bottom.svg - arrow_left.svg - arrow_right.svg - arrow_top.svg - basic.svg - category_adhesion.svg - category_blackmagic.svg - category_cool.svg - category_dual.svg - category_fixes.svg - category_infill.svg - category_layer_height.svg - category_material.svg - category_shell.svg - category_shield.svg - category_speed.svg - category_support.svg - category_travel.svg - category_unknown.svg - check.svg - cross1.svg - cross2.svg - dense.svg - dot.svg - hollow.svg - load.svg - mirror.svg - open.svg - plugin.svg - plus.svg - printsetup.svg - print_time.svg - quick.svg - reset.svg - rotate.svg - rotate_layflat.svg - rotate_reset.svg - save.svg - save_sd.svg - scale.svg - scale_max.svg - scale_reset.svg - setting_per_object.svg - settings.svg - solid.svg - sparse.svg - ulti.svg - view_layer.svg - viewmode.svg - view_normal.svg - view_xray.svg -)