diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-16 11:23:51 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-16 11:23:51 -0700 |
| commit | 7d6107aba3aaa4536d08b9c3ab11478cd1ffd6e2 (patch) | |
| tree | d92f044a591cfeaf158a1aa99a5af29cc6017ee2 | |
| parent | ccba924dacfd8a3478dad8599f33786bf24fdc73 (diff) | |
| parent | 1c92d6bf28add28fe65772c5f9c254e5c7370ba0 (diff) | |
Merged my 3 mac fixes with palmer's latest event_host_manifest.py changes.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 82a1419210..341b74b6f8 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1196,6 +1196,11 @@ if (LLKDU_LIBRARY) add_dependencies(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARY}) endif (LLKDU_LIBRARY) +# add package files +file(GLOB EVENT_HOST_SCRIPT_GLOB_LIST + ${CMAKE_CURRENT_SOURCE_DIR}/../viewer_components/*.py) +list(APPEND EVENT_HOST_SCRIPTS ${EVENT_HOST_SCRIPT_GLOB_LIST}) + set(PACKAGE OFF CACHE BOOL "Add a package target that builds an installer package.") @@ -1291,8 +1296,26 @@ if (WINDOWS) DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) if (PACKAGE) - add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/event_host.tar.bz2 + COMMAND ${PYTHON_EXECUTABLE} + ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CFG_INTDIR} + + DEPENDS + lleventhost + ${EVENT_HOST_SCRIPTS} + ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py) + + add_custom_target(package ALL + DEPENDS + ${CMAKE_CFG_INTDIR}/touched.bat + ${CMAKE_CURRENT_SOURCE_DIR}/event_host.tar.bz2) add_dependencies(package windows-updater windows-crash-logger) + + endif (PACKAGE) endif (WINDOWS) |