[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.124 1.125

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
ENH: Simplify code by removing redundant check against BUILD_WITH_INSTALL_RPATH.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- cmGlobalXCodeGenerator.cxx	29 Sep 2006 20:14:34 -0000	1.124
+++ cmGlobalXCodeGenerator.cxx	11 Oct 2006 16:41:17 -0000	1.125
@@ -1432,18 +1432,8 @@
   std::string install_name_dir;
   if(target.GetType() == cmTarget::SHARED_LIBRARY)
     {
-    // Select whether to generate an install_name directory for the
-    // install tree or the build tree.
-    if(target.GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"))
-      {
-      install_name_dir =
-        target.GetInstallNameDirForInstallTree(configName);
-      }
-    else
-      {
-      install_name_dir =
-        target.GetInstallNameDirForBuildTree(configName);
-      }
+    // Get the install_name directory for the build tree.
+    install_name_dir = target.GetInstallNameDirForBuildTree(configName);
 
     if(install_name_dir.empty())
       {