[Cmake-commits] [cmake-commits] king committed cmInstallGenerator.cxx 1.15 1.16

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Dec 16 09:20:53 EST 2008


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv24627/Source

Modified Files:
	cmInstallGenerator.cxx 
Log Message:
BUG: Fix component-name test on installation

Generated cmake_install.cmake script code used MATCHES to compare
component names.  This does not support characters considered special by
regular expression syntax in component names.  This change uses STREQUAL
instead.  See issue #8256.


Index: cmInstallGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallGenerator.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** cmInstallGenerator.cxx	28 Jan 2008 13:38:35 -0000	1.15
--- cmInstallGenerator.cxx	16 Dec 2008 14:20:51 -0000	1.16
***************
*** 190,196 ****
  {
    std::string result = "NOT CMAKE_INSTALL_COMPONENT OR "
!     "\"${CMAKE_INSTALL_COMPONENT}\" MATCHES \"^(";
    result += component;
!   result += ")$\"";
    return result;
  }
--- 190,196 ----
  {
    std::string result = "NOT CMAKE_INSTALL_COMPONENT OR "
!     "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \"";
    result += component;
!   result += "\"";
    return result;
  }



More information about the Cmake-commits mailing list