ImageDecoder: Move all ImageDecoder configuration to Services

Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/6208abc221e
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2251

Ladybird/CMakeLists.txt

@@ -132,7 +132,6 @@ else()
 endif()
 
 add_subdirectory(Headless)
-add_subdirectory(ImageDecoder)
 add_subdirectory(RequestServer)
 add_subdirectory(WebContent)
 add_subdirectory(WebWorker)

Userland/Services/CMakeLists.txt

@@ -1 +1,2 @@
+add_subdirectory(ImageDecoder)
 add_subdirectory(WebDriver)

Userland/Services/ImageDecoder/CMakeLists.txt

@@ -1,27 +1,26 @@
-set(IMAGE_DECODER_SOURCE_DIR ${LADYBIRD_SOURCE_DIR}/Userland/Services/ImageDecoder)
-
 set(CMAKE_AUTOMOC OFF)
 set(CMAKE_AUTORCC OFF)
 set(CMAKE_AUTOUIC OFF)
 
-set(IMAGE_DECODER_SOURCES
-    ${IMAGE_DECODER_SOURCE_DIR}/ConnectionFromClient.cpp
+set(SOURCES
+    ConnectionFromClient.cpp
 )
 
 if (ANDROID)
     add_library(imagedecoderservice SHARED
-            ${IMAGE_DECODER_SOURCES}
-            ../Android/src/main/cpp/ImageDecoderService.cpp
-            ../Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
-            ../Utilities.cpp
-            )
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/ImageDecoderService.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
+        ${SOURCES}
+    )
 else()
-    add_library(imagedecoderservice STATIC ${IMAGE_DECODER_SOURCES})
+    add_library(imagedecoderservice STATIC ${SOURCES})
 endif()
 
 add_executable(ImageDecoder main.cpp)
-target_link_libraries(ImageDecoder PRIVATE imagedecoderservice LibCore LibMain)
 
+target_include_directories(imagedecoderservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..)
 target_include_directories(imagedecoderservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/)
-target_include_directories(imagedecoderservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..)
+
+target_link_libraries(ImageDecoder PRIVATE imagedecoderservice LibCore LibMain)
 target_link_libraries(imagedecoderservice PRIVATE LibCore LibGfx LibIPC LibImageDecoderClient LibMain LibThreading)