diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-09-03 18:26:51 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-09-03 18:26:51 -0400 |
| commit | e59ac9197c22456542a6a9c0d5ef24c4d11ff6f7 (patch) | |
| tree | 1a455a1aa3853dcaf6e1d48706fc6f18629733e9 /indra/newview | |
| parent | 5260a53e8822ed3e77ae19f412f59ef741005f63 (diff) | |
fix for build_win32_appConfig.py failing to find Microsoft.VC80.CRT.manifest on clean builds.
the "Copying staged dlls" pre-build step for newview got moved to be a pre-build step for
create_app_config_file and create_app_config_file now depends on stage_third_party_libs.
reviewed by Nat.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index be75d8fe5f..3239fbf84e 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1342,11 +1342,29 @@ if (WINDOWS) ) if(WINDOWS) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${VIEWER_BINARY_NAME}.exe.config + COMMAND ${PYTHON_EXECUTABLE} + ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py + ${CMAKE_CFG_INTDIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} + ${VIEWER_BINARY_NAME}.exe.config + COMMENT "Creating app.config file" + ) + + add_custom_target(create_app_config_file ALL + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${VIEWER_BINARY_NAME}.exe.config + stage_third_party_libs + ) + # Copy Win Libs... # This happens at build time, not config time. We can't glob files in this cmake. # *FIX:Mani Write a sub script to glob the files... add_custom_command( - TARGET ${VIEWER_BINARY_NAME} PRE_BUILD + TARGET create_app_config_file PRE_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E @@ -1356,23 +1374,6 @@ if (WINDOWS) COMMENT "Copying staged dlls." ) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${VIEWER_BINARY_NAME}.exe.config - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py - ${CMAKE_CFG_INTDIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} - ${VIEWER_BINARY_NAME}.exe.config - COMMENT "Creating app.config file" - ) - - add_custom_target(create_app_config_file ALL - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${VIEWER_BINARY_NAME}.exe.config - ) - add_dependencies(${VIEWER_BINARY_NAME} create_app_config_file) endif(WINDOWS) |