diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-02-15 15:27:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-02-15 15:27:05 -0500 |
| commit | 9472098e81b3381803237d2a87a4c5de6164b48d (patch) | |
| tree | 43f4fa1450ada5d914df197fdc08feaee862ef0e | |
| parent | b6cdeb2271c3a75dc72b7cfb8c70e0b66c8e246e (diff) | |
improve dependency declarations for packages-info and other settings files
| -rw-r--r-- | indra/cmake/BuildPackagesInfo.cmake | 1 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index 133ee9797a..93461cea95 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -11,6 +11,7 @@ add_custom_command(OUTPUT packages-info.txt COMMENT Generating packages-info.txt for the about box MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py + ${CMAKE_SOURCE_DIR}/../autobuild.xml COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} ${PYTHON_EXECUTABLE} diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index d1614b5f26..c4ded8c5ae 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1741,6 +1741,7 @@ if (WINDOWS) ${ARCH_PREBUILT_DIRS_RELEASE}/ssleay32.dll ${ARCH_PREBUILT_DIRS_DEBUG}/libeay32.dll ${ARCH_PREBUILT_DIRS_DEBUG}/ssleay32.dll + ${viewer_APPSETTINGS_FILES} SLPlugin media_plugin_cef media_plugin_libvlc |