diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 72a9e50bdc..98fa825dae 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -382,23 +382,3 @@ include(CTest) if (BUILD_TESTING) add_serenity_subdirectory(Tests) endif() - -install(TARGETS js COMPONENT js) - -set(CPACK_GENERATOR "TGZ") -set(CPACK_STRIP_FILES TRUE) -set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) -set(CPACK_COMPONENTS_ALL js) -if (APPLE) - if("arm64" IN_LIST CMAKE_OSX_ARCHITECTURES AND "x86_64" IN_LIST CMAKE_OSX_ARCHITECTURES) - set(CPACK_SYSTEM_NAME "macOS-universal2") - else() - set(CPACK_SYSTEM_NAME "macOS-${CMAKE_SYSTEM_PROCESSOR}") - endif() -else() - set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") -endif() - -set(CPACK_ARCHIVE_JS_FILE_NAME "ladybird-js-${CPACK_SYSTEM_NAME}") -set(CPACK_PACKAGE_FILE_NAME "ladybird-js-${CPACK_SYSTEM_NAME}") -include(CPack) diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 81a1de6788..013347c6a3 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -27,3 +27,25 @@ endif() lagom_utility(wasm SOURCES wasm.cpp LIBS LibFileSystem LibWasm LibLine LibMain) lagom_utility(xml SOURCES xml.cpp LIBS LibFileSystem LibMain LibXML LibURL) + +if (NOT CMAKE_SKIP_INSTALL_RULES) + install(TARGETS js COMPONENT js) + + set(CPACK_GENERATOR "TGZ") + set(CPACK_STRIP_FILES TRUE) + set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) + set(CPACK_COMPONENTS_ALL js) + if (APPLE) + if("arm64" IN_LIST CMAKE_OSX_ARCHITECTURES AND "x86_64" IN_LIST CMAKE_OSX_ARCHITECTURES) + set(CPACK_SYSTEM_NAME "macOS-universal2") + else() + set(CPACK_SYSTEM_NAME "macOS-${CMAKE_SYSTEM_PROCESSOR}") + endif() + else() + set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") + endif() + + set(CPACK_ARCHIVE_JS_FILE_NAME "ladybird-js-${CPACK_SYSTEM_NAME}") + set(CPACK_PACKAGE_FILE_NAME "ladybird-js-${CPACK_SYSTEM_NAME}") + include(CPack) +endif()