Skip to content
Snippets Groups Projects
Commit e59ac919 authored by brad kittenbrink's avatar brad kittenbrink
Browse files

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.
parent 5260a53e
No related branches found
No related tags found
No related merge requests found
...@@ -1342,11 +1342,29 @@ if (WINDOWS) ...@@ -1342,11 +1342,29 @@ if (WINDOWS)
) )
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... # Copy Win Libs...
# This happens at build time, not config time. We can't glob files in this cmake. # 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... # *FIX:Mani Write a sub script to glob the files...
add_custom_command( add_custom_command(
TARGET ${VIEWER_BINARY_NAME} PRE_BUILD TARGET create_app_config_file PRE_BUILD
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
ARGS ARGS
-E -E
...@@ -1356,23 +1374,6 @@ if (WINDOWS) ...@@ -1356,23 +1374,6 @@ if (WINDOWS)
COMMENT "Copying staged dlls." 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) add_dependencies(${VIEWER_BINARY_NAME} create_app_config_file)
endif(WINDOWS) endif(WINDOWS)
......
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