Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions indra/integration_tests/llimage_libtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

# Integration tests of the llimage library (JPEG2000, PNG, jpeg, etc... images reading and writing)
if(AL_BUILD_TESTS)
# Run from the build tree, as a test binary is, so without vcpkg's
# app-local step.
set(VCPKG_APPLOCAL_DEPS OFF)
add_executable(llimage_libtest)

target_sources(llimage_libtest PRIVATE llimage_libtest.cpp llimage_libtest.h)
Expand Down
8 changes: 7 additions & 1 deletion indra/llcorehttp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ if(AL_BUILD_TESTS)
# The state guard's checks on what llcorehttp keeps for the process, for
# every test binary that links it.
add_library(llcorehttp_test_checks OBJECT tests/llcorehttp_test_checks.cpp)
target_link_libraries(llcorehttp_test_checks PRIVATE al::flags al_test_support llcorehttp llmessage)
target_link_libraries(
llcorehttp_test_checks
PRIVATE al::flags al_test_support llcorehttp llmessage
)
set_target_properties(llcorehttp_test_checks PROPERTIES FOLDER "Tests/llcorehttp")

# The suites run under a Python peer that serves the requests they make.
Expand Down Expand Up @@ -109,6 +112,9 @@ if(AL_BUILD_TESTS)
#
# Example Programs
#
# Run from the build tree, as a test binary is, so without vcpkg's
# app-local step.
set(VCPKG_APPLOCAL_DEPS OFF)
add_executable(http_texture_load examples/http_texture_load.cpp)
set_target_properties(
http_texture_load
Expand Down
115 changes: 60 additions & 55 deletions indra/llui/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,73 @@
# The console utilities over the UI. What each is for, and how it is run,
# is at the top of its own file.
if(AL_BUILD_TESTS)
add_executable(llui_libtest)
# Run from the build tree, as a test binary is, so without vcpkg's
# app-local step: it is a run of vcpkg.exe after each link, and runs
# started together fail now and then with the file in use.
set(VCPKG_APPLOCAL_DEPS OFF)

target_sources(
llui_libtest
PRIVATE
alparamfingerprint.cpp
llui_libtest.cpp
llwidgetreg.cpp
alparamfingerprint.h
llui_libtest.h
llwidgetreg.h
)
add_executable(llui_libtest)

target_link_libraries(
llui_libtest
PRIVATE al::flags llui llinventory llmessage llrender llimage
)
target_sources(
llui_libtest
PRIVATE
alparamfingerprint.cpp
llui_libtest.cpp
llwidgetreg.cpp
alparamfingerprint.h
llui_libtest.h
llwidgetreg.h
)

set_target_properties(
llui_libtest
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}" FOLDER "Utils"
)
target_link_libraries(
llui_libtest
PRIVATE al::flags llui llinventory llmessage llrender llimage
)

# The app-data directory used to be reached with a relative path guessed from
# the executable's location, which stopped matching the build layout long ago.
# Bake in the real one instead.
target_compile_definitions(
llui_libtest
PRIVATE "LLUI_LIBTEST_APP_RO_DIR=\"${INDRA_SOURCE_DIR}/newview\""
)
set_target_properties(
llui_libtest
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}" FOLDER "Utils"
)

# The viewer used to depend on this one, from a directory configured after
# newview; beside the library it is about, that target does not exist yet.
# It builds with the tests instead, which is where it is run from.
# The app-data directory used to be reached with a relative path guessed from
# the executable's location, which stopped matching the build layout long ago.
# Bake in the real one instead.
target_compile_definitions(
llui_libtest
PRIVATE "LLUI_LIBTEST_APP_RO_DIR=\"${INDRA_SOURCE_DIR}/newview\""
)

# The overlay census: the viewer's own merge over every skin and language
# of the source tree, printed by language and gated by the committed
# baseline. It writes nothing but its own report, so it is the ctest that
# guards the merge as well as the instrument a repair pass is measured
# with.
add_executable(xui_overlay_check xui_overlay_check.cpp)
target_link_libraries(
xui_overlay_check
PRIVATE al::flags llxml llmessage llcorehttp llcommon
)
set_target_properties(
xui_overlay_check
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}" FOLDER "Utils"
)
# The viewer used to depend on this one, from a directory configured after
# newview; beside the library it is about, that target does not exist yet.
# It builds with the tests instead, which is where it is run from.

# The translation repair over a whole language, which is XUI Studio's
# own action from a console: a repair pass is then a command and the diff
# it leaves.
add_executable(xui_translate_repair xui_translate_repair.cpp)
target_link_libraries(
xui_translate_repair
PRIVATE al::flags llui llmessage llcorehttp llxml llrender llcommon
)
set_target_properties(
xui_translate_repair
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}" FOLDER "Utils"
)
# The overlay census: the viewer's own merge over every skin and language
# of the source tree, printed by language and gated by the committed
# baseline. It writes nothing but its own report, so it is the ctest that
# guards the merge as well as the instrument a repair pass is measured
# with.
add_executable(xui_overlay_check xui_overlay_check.cpp)
target_link_libraries(
xui_overlay_check
PRIVATE al::flags llxml llmessage llcorehttp llcommon
)
set_target_properties(
xui_overlay_check
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}" FOLDER "Utils"
)

# The translation repair over a whole language, which is XUI Studio's
# own action from a console: a repair pass is then a command and the diff
# it leaves.
add_executable(xui_translate_repair xui_translate_repair.cpp)
target_link_libraries(
xui_translate_repair
PRIVATE al::flags llui llmessage llcorehttp llxml llrender llcommon
)
set_target_properties(
xui_translate_repair
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}" FOLDER "Utils"
)

add_dependencies(BUILD_TESTS llui_libtest xui_overlay_check xui_translate_repair)
add_test(
Expand Down
Loading