diff --git a/Meta/CMake/utils.cmake b/Meta/CMake/utils.cmake index 8eb0bbd9596..4f9d5d5e1a6 100644 --- a/Meta/CMake/utils.cmake +++ b/Meta/CMake/utils.cmake @@ -71,20 +71,6 @@ if (NOT COMMAND serenity_lib) endfunction() endif() -if (NOT COMMAND serenity_lib_static) - function(serenity_lib_static target_name fs_name) - serenity_install_headers(${target_name}) - serenity_install_sources() - add_library(${target_name} STATIC ${SOURCES} ${GENERATED_SOURCES}) - set_target_properties(${target_name} PROPERTIES EXCLUDE_FROM_ALL TRUE) - set_target_properties(${target_name} PROPERTIES VERSION "serenity") - install(TARGETS ${target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) - set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name}) - serenity_generated_sources(${target_name}) - serenity_set_implicit_links(${target_name}) - endfunction() -endif() - function(serenity_libc target_name fs_name) serenity_install_headers("") serenity_install_sources() diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 7ed943ed28c..78d5f95aac9 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -315,10 +315,6 @@ function(serenity_lib name fs_name) lagom_lib(${name} ${fs_name} LIBRARY_TYPE ${SERENITY_LIB_TYPE} SOURCES ${SOURCES} ${GENERATED_SOURCES}) endfunction() -function(serenity_lib_static name fs_name) - lagom_lib(${name} ${fs_name} LIBRARY_TYPE STATIC SOURCES ${SOURCES} ${GENERATED_SOURCES}) -endfunction() - function(serenity_install_headers dir) endfunction() diff --git a/Userland/Libraries/LibMain/CMakeLists.txt b/Userland/Libraries/LibMain/CMakeLists.txt index 5096b8afc15..3d470fd7c64 100644 --- a/Userland/Libraries/LibMain/CMakeLists.txt +++ b/Userland/Libraries/LibMain/CMakeLists.txt @@ -2,4 +2,4 @@ set(SOURCES Main.cpp ) -serenity_lib_static(LibMain main) +serenity_lib(LibMain main TYPE STATIC)