Auto use install_VS2010.xml for MSVC100

Sat, 03 Mar 2012 11:58:40 -0800

author
Kadah_Coba <kadah.coba@gmail.com>
date
Sat, 03 Mar 2012 11:58:40 -0800
changeset 1655
d306a7d52dd3
parent 1654
839c2ca53e6b
child 1657
e09322792c05

Auto use install_VS2010.xml for MSVC100

indra/CMakeLists.txt file | annotate | diff | revisions
indra/cmake/DownloadPrebuilt.cmake.in file | annotate | diff | revisions
     1.1 --- a/indra/CMakeLists.txt	Sat Mar 03 05:43:12 2012 -0600
     1.2 +++ b/indra/CMakeLists.txt	Sat Mar 03 11:58:40 2012 -0800
     1.3 @@ -160,6 +160,15 @@
     1.4    # packages in the PREBUILT property of the 'prepare' target.
     1.5    get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
     1.6  
     1.7 +  # KC- Use different install.xml for msvc2010
     1.8 +  if(WINDOWS AND MSVC10)
     1.9 +    set(INSTALL_XML install_VS2010.xml)
    1.10 +    message(STATUS "Using install_VS2010.xml")
    1.11 +  else(WINDOWS AND MSVC10)
    1.12 +    set(INSTALL_XML install.xml)
    1.13 +    message(STATUS "Using install.xml")
    1.14 +  endif(WINDOWS AND MSVC10)
    1.15 +
    1.16    # Create a script to download the needed binaries.
    1.17    configure_file(${CMAKE_SOURCE_DIR}/cmake/DownloadPrebuilt.cmake.in
    1.18                   ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake @ONLY)
     2.1 --- a/indra/cmake/DownloadPrebuilt.cmake.in	Sat Mar 03 05:43:12 2012 -0600
     2.2 +++ b/indra/cmake/DownloadPrebuilt.cmake.in	Sat Mar 03 11:58:40 2012 -0800
     2.3 @@ -15,11 +15,11 @@
     2.4  endif(proprietary)
     2.5  
     2.6  foreach(package ${packages})
     2.7 -  if(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
     2.8 +  if(${install_dir}/@INSTALL_XML@ IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
     2.9      # This package is missing or out of date.
    2.10      message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'")
    2.11      execute_process(
    2.12 -      COMMAND ${python} install.py --install-dir=${install_dir} ${scp_option} ${package}
    2.13 +      COMMAND ${python} install.py --install-dir=${install_dir} --install-manifest=${install_dir}/@INSTALL_XML@ ${scp_option} ${package}
    2.14        WORKING_DIRECTORY ${scripts_dir}
    2.15        RESULT_VARIABLE result
    2.16        )
    2.17 @@ -34,10 +34,10 @@
    2.18          "Failed to download or unpack prebuilt '${package}'.  "
    2.19          "Process returned: ${result}")
    2.20      endif(result STREQUAL 0)
    2.21 -  else(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
    2.22 +  else(${install_dir}/@INSTALL_XML@ IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
    2.23      # This package is ready.
    2.24      message(STATUS "Prebuilt '${package}' is up-to-date")
    2.25 -  endif(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
    2.26 +  endif(${install_dir}/@INSTALL_XML@ IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
    2.27  endforeach(package)
    2.28  
    2.29  # Store a sentinel to avoid running this script unnecessarily.

mercurial