diff --git a/Libraries/LibTest/CMakeLists.txt b/Libraries/LibTest/CMakeLists.txt index 88cb41dc4ed..f0974e4e520 100644 --- a/Libraries/LibTest/CMakeLists.txt +++ b/Libraries/LibTest/CMakeLists.txt @@ -1,16 +1,13 @@ -serenity_install_sources("Libraries/LibTest") +add_library(LibTestMain OBJECT TestMain.cpp) +target_link_libraries(LibTestMain PUBLIC GenericClangPlugin) + +add_library(JavaScriptTestRunnerMain OBJECT JavaScriptTestRunnerMain.cpp) set(SOURCES TestSuite.cpp CrashTest.cpp ) -serenity_lib(LibTest test) - -add_library(LibTestMain OBJECT TestMain.cpp) -add_library(JavaScriptTestRunnerMain OBJECT JavaScriptTestRunnerMain.cpp) - -if (SERENITYOS) - add_dependencies(LibTestMain install_libc_headers) - add_dependencies(JavaScriptTestRunnerMain install_libc_headers) -endif() +add_library(LibTest ${SOURCES}) +target_link_libraries(LibTest PRIVATE AK LibCore LibFileSystem) +set_target_properties(LibTest PROPERTIES OUTPUT_NAME lagom-test) diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index c10d43379e3..5320d76f3ae 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -400,6 +400,7 @@ set(lagom_standard_libraries Requests RIFF Syntax + Test TextCodec Threading TLS @@ -492,23 +493,6 @@ lagom_utility(xml SOURCES ../../Utilities/xml.cpp LIBS LibFileSystem LibMain Lib include(CTest) if (BUILD_TESTING) - # LibTest - file(GLOB LIBTEST_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibTest/*.cpp") - list(FILTER LIBTEST_SOURCES EXCLUDE REGEX ".*Main.cpp$") - add_library( - LibTest - ${LIBTEST_SOURCES} - ) - target_link_libraries(LibTest PRIVATE AK LibCore LibFileSystem) - set_target_properties(LibTest PROPERTIES OUTPUT_NAME lagom-test) - add_library( - LibTestMain - OBJECT - "${SERENITY_PROJECT_ROOT}/Libraries/LibTest/TestMain.cpp" - ) - target_link_libraries(LibTest PUBLIC GenericClangPlugin) - target_link_libraries(LibTestMain PUBLIC GenericClangPlugin) - # LibTest tests from Tests/ set(TEST_DIRECTORIES AK