mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-28 13:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

CMake: Build LibTest[Main] in Libraries/LibTest not Meta/Lagom

Browse source 
As LibTest was not specified in TEST_DIRECTORIES, the existing
Libraries/LibTest subdirectory was not actually included during
configuration.
This commit is contained in:
ayeteadoe 2025-05-13 00:56:47 -07:00 • committed by Andrew Kaster
commit d44ac0874f
Notes: github-actions[bot] 2025-05-14 08:06:42 +00:00
2 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Libraries/LibTest/CMakeLists.txt
View file

@ -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 set(SOURCES
TestSuite.cpp TestSuite.cpp
CrashTest.cpp CrashTest.cpp
) )
serenity_lib(LibTest test) add_library(LibTest ${SOURCES})
target_link_libraries(LibTest PRIVATE AK LibCore LibFileSystem)
add_library(LibTestMain OBJECT TestMain.cpp) set_target_properties(LibTest PROPERTIES OUTPUT_NAME lagom-test)
add_library(JavaScriptTestRunnerMain OBJECT JavaScriptTestRunnerMain.cpp)
if (SERENITYOS)
add_dependencies(LibTestMain install_libc_headers)
add_dependencies(JavaScriptTestRunnerMain install_libc_headers)
endif()

18
Meta/Lagom/CMakeLists.txt
View file

@ -400,6 +400,7 @@ set(lagom_standard_libraries
Requests Requests
RIFF RIFF
Syntax Syntax
Test
TextCodec TextCodec
Threading Threading
TLS TLS
@ -492,23 +493,6 @@ lagom_utility(xml SOURCES ../../Utilities/xml.cpp LIBS LibFileSystem LibMain Lib
include(CTest) include(CTest)
if (BUILD_TESTING) 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/ # LibTest tests from Tests/
set(TEST_DIRECTORIES set(TEST_DIRECTORIES
AK AK