OSSForks/ladybird
1
0
Fork 0
mirror of https://github.com/zebrajr/ladybird.git synced 2025-12-06 00:19:53 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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
parent 7280ed6312
commit d44ac0874f
2 changed files with 8 additions and 27 deletions
Show Stats 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
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)

18
Meta/Lagom/CMakeLists.txt
View File

@ -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