removed section in copywinlibs

Sat, 16 Jul 2011 20:56:49 -0700

author
Tank@Tank_PC.ftrdhcpuser.net
date
Sat, 16 Jul 2011 20:56:49 -0700
changeset 1636
893faacf26ea
parent 1635
35f741bfaa34
child 1637
a8be50d2825c

removed section in copywinlibs

indra/cmake/CopyWinLibs.cmake file | annotate | diff | revisions
     1.1 --- a/indra/cmake/CopyWinLibs.cmake	Sat Jul 16 18:02:43 2011 -0700
     1.2 +++ b/indra/cmake/CopyWinLibs.cmake	Sat Jul 16 20:56:49 2011 -0700
     1.3 @@ -343,105 +343,6 @@
     1.4     
     1.5  endif (EXISTS ${internal_llkdu_path})
     1.6  
     1.7 -# Copy MS C runtime dlls, required for packaging.
     1.8 -# *TODO - Adapt this to support VC9
     1.9 -    FIND_PATH(debug_msvc_redist_path msvcr${MSVC_SUFFIX}d.dll
    1.10 -        PATHS
    1.11 -        ${MSVC_DEBUG_REDIST_PATH}
    1.12 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSCV_DIR}\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
    1.13 -        NO_DEFAULT_PATH
    1.14 -        NO_DEFAULT_PATH
    1.15 -        )
    1.16 -
    1.17 -    if(EXISTS ${debug_msvc_redist_path})
    1.18 -        set(debug_msvc${MSVC_SUFFIX}_files
    1.19 -            msvcr${MSVC_SUFFIX}d.dll
    1.20 -            msvcp${MSVC_SUFFIX}d.dll
    1.21 -            Microsoft.VC${MSVC_SUFFIX}.DebugCRT.manifest
    1.22 -            )
    1.23 -
    1.24 -        copy_if_different(
    1.25 -            ${debug_msvc_redist_path} 
    1.26 -            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
    1.27 -            out_targets 
    1.28 -            ${debug_msvc_files}
    1.29 -            )
    1.30 -        set(all_targets ${all_targets} ${out_targets})
    1.31 -
    1.32 -        set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/secondlife-bin.exe.config)
    1.33 -        add_custom_command(
    1.34 -            OUTPUT ${debug_appconfig_file}
    1.35 -            COMMAND ${PYTHON_EXECUTABLE}
    1.36 -            ARGS
    1.37 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
    1.38 -              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC${MSVC_SUFFIX}.DebugCRT.manifest
    1.39 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
    1.40 -              ${debug_appconfig_file}
    1.41 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC${MSVC_SUFFIX}.DebugCRT.manifest
    1.42 -            COMMENT "Creating debug app config file"
    1.43 -            )
    1.44 -
    1.45 -    endif (EXISTS ${debug_msvc_redist_path})
    1.46 -
    1.47 -    FIND_PATH(release_msvc_redist_path msvcr${MSVC_SUFFIX}.dll
    1.48 -        PATHS
    1.49 -        ${MSVC_REDIST_PATH}
    1.50 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_DIR}\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC${MSVC_SUFFIX}.CRT
    1.51 -        NO_DEFAULT_PATH
    1.52 -        NO_DEFAULT_PATH
    1.53 -        )
    1.54 -
    1.55 -    if(EXISTS ${release_msvc_redist_path})
    1.56 -        set(release_msvc8_files
    1.57 -            msvcr${MSVC_SUFFIX}.dll
    1.58 -            msvcp${MSVC_SUFFIX}.dll
    1.59 -            Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
    1.60 -            )
    1.61 -
    1.62 -        copy_if_different(
    1.63 -            ${release_msvc_redist_path} 
    1.64 -            "${CMAKE_CURRENT_BINARY_DIR}/Release"
    1.65 -            out_targets 
    1.66 -            ${release_msvc_files}
    1.67 -            )
    1.68 -        set(all_targets ${all_targets} ${out_targets})
    1.69 -
    1.70 -        copy_if_different(
    1.71 -            ${release_msvc_redist_path} 
    1.72 -            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
    1.73 -            out_targets 
    1.74 -            ${release_msvc_files}
    1.75 -            )
    1.76 -        set(all_targets ${all_targets} ${out_targets})
    1.77 -
    1.78 -        set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/secondlife-bin.exe.config)
    1.79 -        add_custom_command(
    1.80 -            OUTPUT ${release_appconfig_file}
    1.81 -            COMMAND ${PYTHON_EXECUTABLE}
    1.82 -            ARGS
    1.83 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
    1.84 -              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
    1.85 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
    1.86 -              ${release_appconfig_file}
    1.87 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
    1.88 -            COMMENT "Creating release app config file"
    1.89 -            )
    1.90 -
    1.91 -        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/secondlife-bin.exe.config)
    1.92 -        add_custom_command(
    1.93 -            OUTPUT ${relwithdebinfo_appconfig_file}
    1.94 -            COMMAND ${PYTHON_EXECUTABLE}
    1.95 -            ARGS
    1.96 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
    1.97 -              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
    1.98 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
    1.99 -              ${relwithdebinfo_appconfig_file}
   1.100 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC${MSVC_SUFFIX}.CRT.manifest
   1.101 -            COMMENT "Creating relwithdebinfo app config file"
   1.102 -            )
   1.103 -          
   1.104 -    endif (EXISTS ${release_msvc_redist_path})
   1.105 -
   1.106  add_custom_target(copy_win_libs ALL
   1.107    DEPENDS 
   1.108      ${all_targets}

mercurial