diff options
author | Sergey Bugaev <bugaevc@serenityos.org> | 2020-05-06 18:40:06 +0300 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-05-14 20:15:18 +0200 |
commit | 450a2a0f9ce2443bc06445ee018c9860d8cd5fc8 (patch) | |
tree | c124a612ef259b764855af5e33c39e0d09ad4df2 /Applications | |
parent | 49727ffee424d8c0038ce18b91b0bf0ff33b1a4d (diff) | |
download | serenity-450a2a0f9ce2443bc06445ee018c9860d8cd5fc8.zip |
Build: Switch to CMake :^)
Closes https://github.com/SerenityOS/serenity/issues/2080
Diffstat (limited to 'Applications')
40 files changed, 216 insertions, 241 deletions
diff --git a/Applications/About/CMakeLists.txt b/Applications/About/CMakeLists.txt new file mode 100644 index 0000000000..0b3023c819 --- /dev/null +++ b/Applications/About/CMakeLists.txt @@ -0,0 +1,12 @@ +set(SOURCES + main.cpp +) + +execute_process(COMMAND "git rev-parse --short HEAD" OUTPUT_VARIABLE GIT_COMMIT) +execute_process(COMMAND "git rev-parse --abbrev-ref HEAD" OUTPUT_VARIABLE GIT_BRANCH) +execute_process(COMMAND "git diff-index --quiet HEAD -- && echo tracked || echo untracked" OUTPUT_VARIABLE GIT_CHANGES) + +add_definitions(-DGIT_COMMIT="${GIT_COMMIT}" -DGIT_BRANCH="${GIT_BRANCH}" -DGIT_CHANGES="${GIT_CHANGES}") + +serenity_bin(About) +target_link_libraries(About LibGUI) diff --git a/Applications/About/Makefile b/Applications/About/Makefile deleted file mode 100644 index 4745b70e23..0000000000 --- a/Applications/About/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OBJS = \ - main.o - -PROGRAM = About - -LIB_DEPS = GUI Gfx IPC Core - -DEFINES += -DGIT_COMMIT=\"`git rev-parse --short HEAD`\" -DGIT_BRANCH=\"`git rev-parse --abbrev-ref HEAD`\" - -include ../../Makefile.common diff --git a/Applications/Browser/CMakeLists.txt b/Applications/Browser/CMakeLists.txt new file mode 100644 index 0000000000..a75572ccde --- /dev/null +++ b/Applications/Browser/CMakeLists.txt @@ -0,0 +1,11 @@ +set(SOURCES + BookmarksBarWidget.cpp + DownloadWidget.cpp + InspectorWidget.cpp + main.cpp + Tab.cpp + WindowActions.cpp +) + +serenity_bin(Browser) +target_link_libraries(Browser LibWeb LibProtocol LibGUI) diff --git a/Applications/Browser/Makefile b/Applications/Browser/Makefile deleted file mode 100644 index 6f53cb01d9..0000000000 --- a/Applications/Browser/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -OBJS = \ - BookmarksBarWidget.o \ - DownloadWidget.o \ - InspectorWidget.o \ - Tab.o \ - WindowActions.o \ - main.o - -PROGRAM = Browser - -LIB_DEPS = Web JS Markdown TextCodec GUI Gfx IPC Protocol Core - -main.cpp: ../../Libraries/LibWeb/CSS/PropertyID.h -../../Libraries/LibWeb/CSS/PropertyID.h: - @flock ../../Libraries/LibWeb $(MAKE) -C ../../Libraries/LibWeb - -main.cpp: ../../Services/ProtocolServer/ProtocolClientEndpoint.h -../../Services/ProtocolServer/ProtocolClientEndpoint.h: - @flock ../../Services/ProtocolServer $(MAKE) -C $(dir $(@)) - -include ../../Makefile.common diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt new file mode 100644 index 0000000000..c7a1828b85 --- /dev/null +++ b/Applications/CMakeLists.txt @@ -0,0 +1,19 @@ +add_subdirectory(About) +add_subdirectory(Browser) +add_subdirectory(Calculator) +add_subdirectory(Calendar) +add_subdirectory(Debugger) +add_subdirectory(DisplaySettings) +add_subdirectory(FileManager) +add_subdirectory(FontEditor) +add_subdirectory(Help) +add_subdirectory(HexEditor) +add_subdirectory(IRCClient) +add_subdirectory(PaintBrush) +add_subdirectory(Piano) +add_subdirectory(QuickShow) +add_subdirectory(SoundPlayer) +add_subdirectory(SystemMonitor) +add_subdirectory(Terminal) +add_subdirectory(TextEditor) +add_subdirectory(Welcome) diff --git a/Applications/Calculator/CMakeLists.txt b/Applications/Calculator/CMakeLists.txt new file mode 100644 index 0000000000..548c37b774 --- /dev/null +++ b/Applications/Calculator/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCES + main.cpp + Calculator.cpp + CalculatorWidget.cpp + Keypad.cpp +) + +serenity_bin(Calculator) +target_link_libraries(Calculator LibGUI) diff --git a/Applications/Calculator/Makefile b/Applications/Calculator/Makefile deleted file mode 100644 index 05ab47eb2d..0000000000 --- a/Applications/Calculator/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OBJS = \ - Calculator.o \ - Keypad.o \ - CalculatorWidget.o \ - main.o - -PROGRAM = Calculator - -LIB_DEPS = GUI Gfx IPC Core - -include ../../Makefile.common diff --git a/Applications/Calendar/CMakeLists.txt b/Applications/Calendar/CMakeLists.txt new file mode 100644 index 0000000000..d08fb39f3f --- /dev/null +++ b/Applications/Calendar/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCES + AddEventDialog.cpp + Calendar.cpp + CalendarWidget.cpp + main.cpp +) + +serenity_bin(Calendar) +target_link_libraries(Calendar LibGUI) diff --git a/Applications/Calendar/Makefile b/Applications/Calendar/Makefile deleted file mode 100644 index 9e8444cb37..0000000000 --- a/Applications/Calendar/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -OBJS = \ - Calendar.o \ - CalendarWidget.o \ - AddEventDialog.o \ - main.o - -PROGRAM = Calendar - -LIB_DEPS = GUI Gfx IPC Core - -include ../../Makefile.common - diff --git a/Applications/Debugger/CMakeLists.txt b/Applications/Debugger/CMakeLists.txt new file mode 100644 index 0000000000..7e6f200ea4 --- /dev/null +++ b/Applications/Debugger/CMakeLists.txt @@ -0,0 +1,6 @@ +set(SOURCES + main.cpp +) + +serenity_bin(Debugger) +target_link_libraries(Debugger LibCore LibDebug LibX86 LibLine) diff --git a/Applications/Debugger/Makefile b/Applications/Debugger/Makefile deleted file mode 100644 index c03aec4ed3..0000000000 --- a/Applications/Debugger/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -OBJS = \ - main.o - -PROGRAM = Debugger - -LIB_DEPS = Core X86 Debug Line - -include ../../Makefile.common diff --git a/Applications/DisplaySettings/CMakeLists.txt b/Applications/DisplaySettings/CMakeLists.txt new file mode 100644 index 0000000000..b5d2162f9d --- /dev/null +++ b/Applications/DisplaySettings/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SOURCES + DisplaySettings.cpp + main.cpp + MonitorWidget.cpp +) + +serenity_bin(DisplaySettings) +target_link_libraries(DisplaySettings LibGUI) diff --git a/Applications/DisplaySettings/Makefile b/Applications/DisplaySettings/Makefile deleted file mode 100644 index 60d1ed6f49..0000000000 --- a/Applications/DisplaySettings/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OBJS = \ - MonitorWidget.o \ - DisplaySettings.o \ - main.o \ - -PROGRAM = DisplaySettings - -LIB_DEPS = GUI Gfx IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/FileManager/CMakeLists.txt b/Applications/FileManager/CMakeLists.txt new file mode 100644 index 0000000000..d54efc046c --- /dev/null +++ b/Applications/FileManager/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCES + DirectoryView.cpp + FileUtils.cpp + main.cpp + PropertiesDialog.cpp +) + +serenity_bin(FileManager) +target_link_libraries(FileManager LibGUI LibDesktop) diff --git a/Applications/FileManager/Makefile b/Applications/FileManager/Makefile deleted file mode 100644 index 1a7e4bc7a9..0000000000 --- a/Applications/FileManager/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OBJS = \ - DirectoryView.o \ - FileUtils.o \ - PropertiesDialog.o \ - main.o - -PROGRAM = FileManager - -LIB_DEPS = GUI Gfx Desktop IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/FontEditor/CMakeLists.txt b/Applications/FontEditor/CMakeLists.txt new file mode 100644 index 0000000000..0c39433507 --- /dev/null +++ b/Applications/FontEditor/CMakeLists.txt @@ -0,0 +1,11 @@ +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +set(SOURCES + FontEditor.cpp + GlyphEditorWidget.cpp + GlyphMapWidget.cpp + main.cpp +) + +serenity_bin(FontEditor) +target_link_libraries(FontEditor LibGUI LibGfx) diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile deleted file mode 100644 index 20b620b202..0000000000 --- a/Applications/FontEditor/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OBJS = \ - FontEditor.o \ - GlyphMapWidget.o \ - GlyphEditorWidget.o \ - main.o - -PROGRAM = FontEditor - -LIB_DEPS = GUI Gfx Core IPC - -include ../../Makefile.common diff --git a/Applications/Help/CMakeLists.txt b/Applications/Help/CMakeLists.txt new file mode 100644 index 0000000000..71bed8e51b --- /dev/null +++ b/Applications/Help/CMakeLists.txt @@ -0,0 +1,10 @@ +set(SOURCES + History.cpp + main.cpp + ManualModel.cpp + ManualPageNode.cpp + ManualSectionNode.cpp +) + +serenity_bin(Help) +target_link_libraries(Help LibWeb LibMarkdown LibGUI) diff --git a/Applications/Help/Makefile b/Applications/Help/Makefile deleted file mode 100644 index d1b1159f5f..0000000000 --- a/Applications/Help/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -OBJS = \ - ManualModel.o \ - ManualSectionNode.o \ - ManualPageNode.o \ - History.o \ - main.o - -PROGRAM = Help - -LIB_DEPS = GUI Web TextCodec JS Gfx Markdown IPC Protocol Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/HexEditor/CMakeLists.txt b/Applications/HexEditor/CMakeLists.txt new file mode 100644 index 0000000000..3de7c9cfb5 --- /dev/null +++ b/Applications/HexEditor/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SOURCES + HexEditor.cpp + HexEditorWidget.cpp + main.cpp +) + +serenity_bin(HexEditor) +target_link_libraries(HexEditor LibGUI) diff --git a/Applications/HexEditor/Makefile b/Applications/HexEditor/Makefile deleted file mode 100644 index 8231655955..0000000000 --- a/Applications/HexEditor/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -OBJS = \ - HexEditor.o \ - HexEditorWidget.o \ - main.o - -PROGRAM = HexEditor - -LIB_DEPS = GUI Gfx IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/IRCClient/CMakeLists.txt b/Applications/IRCClient/CMakeLists.txt new file mode 100644 index 0000000000..6f304b18c1 --- /dev/null +++ b/Applications/IRCClient/CMakeLists.txt @@ -0,0 +1,14 @@ +set(SOURCES + IRCAppWindow.cpp + IRCChannel.cpp + IRCChannelMemberListModel.cpp + IRCClient.cpp + IRCLogBuffer.cpp + IRCQuery.cpp + IRCWindow.cpp + IRCWindowListModel.cpp + main.cpp +) + +serenity_bin(IRCClient) +target_link_libraries(IRCClient LibWeb LibGUI) diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile deleted file mode 100644 index 85cacc569b..0000000000 --- a/Applications/IRCClient/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -OBJS = \ - IRCClient.o \ - IRCChannel.o \ - IRCQuery.o \ - IRCLogBuffer.o \ - IRCAppWindow.o \ - IRCWindow.o \ - IRCWindowListModel.o \ - IRCChannelMemberListModel.o \ - main.o - -PROGRAM = IRCClient - -LIB_DEPS = Web TextCodec JS Markdown GUI Gfx Protocol IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/Makefile b/Applications/Makefile deleted file mode 100644 index 0025ae2061..0000000000 --- a/Applications/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS := $(patsubst %/Makefile,%/,$(wildcard */Makefile)) - -include ../Makefile.subdir diff --git a/Applications/PaintBrush/CMakeLists.txt b/Applications/PaintBrush/CMakeLists.txt new file mode 100644 index 0000000000..bebff13c68 --- /dev/null +++ b/Applications/PaintBrush/CMakeLists.txt @@ -0,0 +1,23 @@ +set(SOURCES + BucketTool.cpp + CreateNewLayerDialog.cpp + EllipseTool.cpp + EraseTool.cpp + Image.cpp + ImageEditor.cpp + Layer.cpp + LayerModel.cpp + LineTool.cpp + main.cpp + MoveTool.cpp + PaletteWidget.cpp + PenTool.cpp + PickerTool.cpp + RectangleTool.cpp + SprayTool.cpp + ToolboxWidget.cpp + Tool.cpp +) + +serenity_bin(PaintBrush) +target_link_libraries(PaintBrush LibGUI LibGfx) diff --git a/Applications/PaintBrush/Makefile b/Applications/PaintBrush/Makefile deleted file mode 100644 index 54cec5e315..0000000000 --- a/Applications/PaintBrush/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -OBJS = \ - BucketTool.o \ - CreateNewLayerDialog.o \ - EllipseTool.o \ - EraseTool.o \ - Image.o \ - ImageEditor.o \ - Layer.o \ - LayerModel.o \ - LineTool.o \ - MoveTool.o \ - PaletteWidget.o \ - PenTool.o \ - PickerTool.o \ - RectangleTool.o \ - SprayTool.o \ - Tool.o \ - ToolboxWidget.o \ - main.o - -PROGRAM = PaintBrush - -LIB_DEPS = GUI Gfx IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/Piano/CMakeLists.txt b/Applications/Piano/CMakeLists.txt new file mode 100644 index 0000000000..0ba5a8ce91 --- /dev/null +++ b/Applications/Piano/CMakeLists.txt @@ -0,0 +1,13 @@ +set(SOURCES + AudioEngine.cpp + KeysWidget.cpp + KnobsWidget.cpp + main.cpp + MainWidget.cpp + RollWidget.cpp + SamplerWidget.cpp + WaveWidget.cpp +) + +serenity_bin(Piano) +target_link_libraries(Piano LibAudio LibGUI) diff --git a/Applications/Piano/Makefile b/Applications/Piano/Makefile deleted file mode 100644 index aadbd615de..0000000000 --- a/Applications/Piano/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -OBJS = \ - AudioEngine.o \ - MainWidget.o \ - WaveWidget.o \ - RollWidget.o \ - SamplerWidget.o \ - KeysWidget.o \ - KnobsWidget.o \ - main.o - -PROGRAM = Piano - -LIB_DEPS = GUI Gfx Audio IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/QuickShow/CMakeLists.txt b/Applications/QuickShow/CMakeLists.txt new file mode 100644 index 0000000000..c0f9a05e6b --- /dev/null +++ b/Applications/QuickShow/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCES + main.cpp + QSWidget.cpp +) + +serenity_bin(QuickShow) +target_link_libraries(QuickShow LibGUI LibGfx) diff --git a/Applications/QuickShow/Makefile b/Applications/QuickShow/Makefile deleted file mode 100644 index c77b2eade3..0000000000 --- a/Applications/QuickShow/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -OBJS = \ - QSWidget.o \ - main.o - -PROGRAM = QuickShow - -LIB_DEPS = GUI Gfx Protocol IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/SoundPlayer/CMakeLists.txt b/Applications/SoundPlayer/CMakeLists.txt new file mode 100644 index 0000000000..6c71842cd3 --- /dev/null +++ b/Applications/SoundPlayer/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCES + main.cpp + PlaybackManager.cpp + SampleWidget.cpp + SoundPlayerWidget.cpp +) + +serenity_bin(SoundPlayer) +target_link_libraries(SoundPlayer LibAudio LibGUI) diff --git a/Applications/SoundPlayer/Makefile b/Applications/SoundPlayer/Makefile deleted file mode 100644 index 2d0bc01f50..0000000000 --- a/Applications/SoundPlayer/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OBJS = \ - PlaybackManager.o \ - SampleWidget.o \ - SoundPlayerWidget.o \ - main.o - -PROGRAM = SoundPlayer - -LIB_DEPS = GUI Gfx Audio IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/SystemMonitor/CMakeLists.txt b/Applications/SystemMonitor/CMakeLists.txt new file mode 100644 index 0000000000..03fcfd61ad --- /dev/null +++ b/Applications/SystemMonitor/CMakeLists.txt @@ -0,0 +1,16 @@ +set(SOURCES + DevicesModel.cpp + GraphWidget.cpp + main.cpp + MemoryStatsWidget.cpp + NetworkStatisticsWidget.cpp + ProcessFileDescriptorMapWidget.cpp + ProcessMemoryMapWidget.cpp + ProcessModel.cpp + ProcessStacksWidget.cpp + ProcessTableView.cpp + ProcessUnveiledPathsWidget.cpp +) + +serenity_bin(SystemMonitor) +target_link_libraries(SystemMonitor LibGUI LibPCIDB) diff --git a/Applications/SystemMonitor/Makefile b/Applications/SystemMonitor/Makefile deleted file mode 100644 index 99cd6f77c0..0000000000 --- a/Applications/SystemMonitor/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -OBJS = \ - ProcessModel.o \ - DevicesModel.o \ - ProcessTableView.o \ - MemoryStatsWidget.o \ - GraphWidget.o \ - ProcessStacksWidget.o \ - ProcessMemoryMapWidget.o \ - ProcessFileDescriptorMapWidget.o \ - NetworkStatisticsWidget.o \ - ProcessUnveiledPathsWidget.o \ - main.o - -PROGRAM = SystemMonitor - -LIB_DEPS = GUI Gfx Protocol PCIDB IPC Thread Pthread Core - -include ../../Makefile.common diff --git a/Applications/Terminal/CMakeLists.txt b/Applications/Terminal/CMakeLists.txt new file mode 100644 index 0000000000..c3a97c0886 --- /dev/null +++ b/Applications/Terminal/CMakeLists.txt @@ -0,0 +1,6 @@ +set(SOURCES + main.cpp +) + +serenity_bin(Terminal) +target_link_libraries(Terminal LibGUI LibVT) diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile deleted file mode 100644 index b3deb0b3bf..0000000000 --- a/Applications/Terminal/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -OBJS = \ - main.o - -PROGRAM = Terminal - -LIB_DEPS = GUI Gfx VT Desktop IPC Protocol Core - -include ../../Makefile.common diff --git a/Applications/TextEditor/CMakeLists.txt b/Applications/TextEditor/CMakeLists.txt new file mode 100644 index 0000000000..6b3346edf3 --- /dev/null +++ b/Applications/TextEditor/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCES + main.cpp + TextEditorWidget.cpp +) + +serenity_bin(TextEditor) +target_link_libraries(TextEditor LibWeb LibMarkdown LibGUI) diff --git a/Applications/TextEditor/Makefile b/Applications/TextEditor/Makefile deleted file mode 100644 index 545526a16a..0000000000 --- a/Applications/TextEditor/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -OBJS = \ - TextEditorWidget.o \ - main.o - -PROGRAM = TextEditor - -LIB_DEPS = Web TextCodec Markdown GUI Gfx VT Protocol IPC Thread Pthread Core JS - -include ../../Makefile.common diff --git a/Applications/Welcome/CMakeLists.txt b/Applications/Welcome/CMakeLists.txt new file mode 100644 index 0000000000..e9d1ef3380 --- /dev/null +++ b/Applications/Welcome/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCES + BackgroundWidget.cpp + main.cpp + TextWidget.cpp + UnuncheckableButton.cpp +) + +serenity_bin(Welcome) +target_link_libraries(Welcome LibGUI) diff --git a/Applications/Welcome/Makefile b/Applications/Welcome/Makefile deleted file mode 100644 index 6fc8d97585..0000000000 --- a/Applications/Welcome/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OBJS = \ - main.o \ - TextWidget.o \ - BackgroundWidget.o \ - UnuncheckableButton.o - -PROGRAM = Welcome - -LIB_DEPS = GUI Gfx IPC Core - -include ../../Makefile.common |