Skip to content
Snippets Groups Projects
Commit b54fd9d6 authored by Tofu Linden's avatar Tofu Linden
Browse files

VWR-8885 CMAKE build hard depends on artwork files

Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly.
Reviewed by Aimee.
parent 13b0b931
No related branches found
No related tags found
No related merge requests found
...@@ -7,3 +7,10 @@ if (NOT STANDALONE) ...@@ -7,3 +7,10 @@ if (NOT STANDALONE)
use_prebuilt_binary(fontconfig) use_prebuilt_binary(fontconfig)
endif(NOT STANDALONE) endif(NOT STANDALONE)
if(VIEWER AND NOT STANDALONE)
if(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
message(STATUS "We seem to have an artwork bundle in the tree - brilliant.")
else(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
message(FATAL_ERROR "Didn't find an artwork bundle - this needs to be downloaded separately and unpacked into this tree. You can probably get it from the same place you got your viewer source. Thanks!")
endif(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker)
endif(VIEWER AND NOT STANDALONE)
...@@ -7,8 +7,8 @@ install(DIRECTORY skins app_settings linux_tools ...@@ -7,8 +7,8 @@ install(DIRECTORY skins app_settings linux_tools
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
find_file(IS_ARTWORK_PRESENT NAMES avatar_lad.xml find_file(IS_ARTWORK_PRESENT NAMES have_artwork_bundle.marker
PATHS ${VIEWER_DIR}/newview/character) PATHS ${VIEWER_DIR}/newview/res)
if (IS_ARTWORK_PRESENT) if (IS_ARTWORK_PRESENT)
install(DIRECTORY res res-sdl character install(DIRECTORY res res-sdl character
......
If this file exists then you have the artwork bundle installed, which is packaged separately from the Viewer source in the open-source tree. This marker is for the benefit of the build system so it can warn you properly if it's not there. :)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment