diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index dbe0fcc4746..367afacdba7 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -132,7 +132,6 @@ else() endif() add_subdirectory(Headless) -add_subdirectory(ImageDecoder) add_subdirectory(RequestServer) add_subdirectory(WebContent) add_subdirectory(WebWorker) diff --git a/Userland/Services/CMakeLists.txt b/Userland/Services/CMakeLists.txt index 55a151f2f08..ae8f41a16ef 100644 --- a/Userland/Services/CMakeLists.txt +++ b/Userland/Services/CMakeLists.txt @@ -1 +1,2 @@ +add_subdirectory(ImageDecoder) add_subdirectory(WebDriver) diff --git a/Ladybird/ImageDecoder/CMakeLists.txt b/Userland/Services/ImageDecoder/CMakeLists.txt similarity index 54% rename from Ladybird/ImageDecoder/CMakeLists.txt rename to Userland/Services/ImageDecoder/CMakeLists.txt index 86c65b63bb5..6cbbd416761 100644 --- a/Ladybird/ImageDecoder/CMakeLists.txt +++ b/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) diff --git a/Ladybird/ImageDecoder/main.cpp b/Userland/Services/ImageDecoder/main.cpp similarity index 100% rename from Ladybird/ImageDecoder/main.cpp rename to Userland/Services/ImageDecoder/main.cpp