diff --git a/Meta/CMake/utils.cmake b/Meta/CMake/utils.cmake index dd4e51869b..942f327ddc 100644 --- a/Meta/CMake/utils.cmake +++ b/Meta/CMake/utils.cmake @@ -77,8 +77,7 @@ function(serenity_test test_src sub_dir) cmake_parse_arguments(SERENITY_TEST "MAIN_ALREADY_DEFINED" "CUSTOM_MAIN" "LIBS" ${ARGN}) set(TEST_SOURCES ${test_src}) if ("${SERENITY_TEST_CUSTOM_MAIN}" STREQUAL "") - set(SERENITY_TEST_CUSTOM_MAIN - "${CMAKE_SOURCE_DIR}/Userland/Libraries/LibTest/TestMain.cpp") + set(SERENITY_TEST_CUSTOM_MAIN "$") endif() if (NOT ${SERENITY_TEST_MAIN_ALREADY_DEFINED}) list(PREPEND TEST_SOURCES "${SERENITY_TEST_CUSTOM_MAIN}") @@ -98,8 +97,7 @@ endfunction() function(serenity_testjs_test test_src sub_dir) cmake_parse_arguments(SERENITY_TEST "" "CUSTOM_MAIN" "LIBS" ${ARGN}) if ("${SERENITY_TEST_CUSTOM_MAIN}" STREQUAL "") - set(SERENITY_TEST_CUSTOM_MAIN - "${CMAKE_SOURCE_DIR}/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp") + set(SERENITY_TEST_CUSTOM_MAIN "$") endif() list(APPEND SERENITY_TEST_LIBS LibJS LibCore) serenity_test(${test_src} ${sub_dir} diff --git a/Userland/Libraries/LibTest/CMakeLists.txt b/Userland/Libraries/LibTest/CMakeLists.txt index ad5f2bb251..c5ba722218 100644 --- a/Userland/Libraries/LibTest/CMakeLists.txt +++ b/Userland/Libraries/LibTest/CMakeLists.txt @@ -7,3 +7,6 @@ set(SOURCES serenity_lib(LibTest test) target_link_libraries(LibTest LibC) + +add_library(LibTestMain OBJECT TestMain.cpp) +add_library(JavaScriptTestRunnerMain OBJECT JavaScriptTestRunnerMain.cpp)