diff options
| author | McCabe Maxsted | 2011-09-08 16:58:34 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-09-08 16:58:34 -0700 |
| commit | 2f84e33d52540877a83aca94129379769feae9a6 (patch) | |
| tree | 4b29bbed8a76cf0158f8f2644785f7c482bc649a /linden | |
| parent | Added a new Windows installer script for ISS. Packaging now just generates a ... (diff) | |
| download | meta-impy-2f84e33d52540877a83aca94129379769feae9a6.zip meta-impy-2f84e33d52540877a83aca94129379769feae9a6.tar.gz meta-impy-2f84e33d52540877a83aca94129379769feae9a6.tar.bz2 meta-impy-2f84e33d52540877a83aca94129379769feae9a6.tar.xz | |
Fixed cmake merge error when adding SSE2 target to copy win libs
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index e03f542..e4d0130 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
| @@ -498,34 +498,33 @@ if(EXISTS ${release_msvc8_redist_path}) | |||
| 498 | ) | 498 | ) |
| 499 | 499 | ||
| 500 | 500 | ||
| 501 | set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config) | 501 | set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config) |
| 502 | add_custom_command( | 502 | add_custom_command( |
| 503 | OUTPUT ${releasesse2_appconfig_file} | 503 | OUTPUT ${releasesse2_appconfig_file} |
| 504 | COMMAND ${PYTHON_EXECUTABLE} | 504 | COMMAND ${PYTHON_EXECUTABLE} |
| 505 | ARGS | 505 | ARGS |
| 506 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 506 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
| 507 | ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest | 507 | ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest |
| 508 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config | 508 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config |
| 509 | ${releasesse2_appconfig_file} | 509 | ${releasesse2_appconfig_file} |
| 510 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest | 510 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest |
| 511 | COMMENT "Creating release (SSE2 optimized) app config file" | 511 | COMMENT "Creating release (SSE2 optimized) app config file" |
| 512 | ) | 512 | ) |
| 513 | 513 | ||
| 514 | set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) | 514 | set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) |
| 515 | add_custom_command( | 515 | add_custom_command( |
| 516 | OUTPUT ${relwithdebinfo_appconfig_file} | 516 | OUTPUT ${relwithdebinfo_appconfig_file} |
| 517 | COMMAND ${PYTHON_EXECUTABLE} | 517 | COMMAND ${PYTHON_EXECUTABLE} |
| 518 | ARGS | 518 | ARGS |
| 519 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 519 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
| 520 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 520 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
| 521 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config | 521 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config |
| 522 | ${relwithdebinfo_appconfig_file} | 522 | ${relwithdebinfo_appconfig_file} |
| 523 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 523 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
| 524 | COMMENT "Creating relwithdebinfo app config file" | 524 | COMMENT "Creating relwithdebinfo app config file" |
| 525 | ) | 525 | ) |
| 526 | 526 | ||
| 527 | endif (EXISTS ${release_msvc8_redist_path}) | 527 | endif (EXISTS ${release_msvc8_redist_path}) |
| 528 | endif (MSVC80) | ||
| 529 | 528 | ||
| 530 | add_custom_target(copy_win_libs ALL | 529 | add_custom_target(copy_win_libs ALL |
| 531 | DEPENDS | 530 | DEPENDS |