[cmake-commits] king committed cmMakefileLibraryTargetGenerator.cxx 1.25 1.26

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Oct 11 12:41:23 EDT 2006


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

Modified Files:
	cmMakefileLibraryTargetGenerator.cxx 
Log Message:
BUG: Do not collapse the INSTALL_NAME_DIR setting because users may intend to have .. in the path.  This makes the makefile generator consistent with the already working Xcode implementation of this feature.  Also added a test for @executable_path/.. style settings for this property.


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cmMakefileLibraryTargetGenerator.cxx	28 Sep 2006 20:40:35 -0000	1.25
+++ cmMakefileLibraryTargetGenerator.cxx	11 Oct 2006 16:41:20 -0000	1.26
@@ -548,19 +548,9 @@
   std::string install_name_dir;
   if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
     {
-    // Select whether to generate an install_name directory for the
-    // install tree or the build tree.
+    // Get the install_name directory for the build tree.
     const char* config = this->LocalGenerator->ConfigurationName.c_str();
-    if(this->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"))
-      {
-      install_name_dir =
-        this->Target->GetInstallNameDirForInstallTree(config);
-      }
-    else
-      {
-      install_name_dir =
-        this->Target->GetInstallNameDirForBuildTree(config);
-      }
+    install_name_dir = this->Target->GetInstallNameDirForBuildTree(config);
 
     // Set the rule variable replacement value.
     if(install_name_dir.empty())
@@ -572,13 +562,8 @@
       // Convert to a path for the native build tool.
       install_name_dir =
         this->LocalGenerator->Convert(install_name_dir.c_str(),
-                                      cmLocalGenerator::FULL,
+                                      cmLocalGenerator::NONE,
                                       cmLocalGenerator::SHELL, false);
-
-      // The Convert method seems to strip trailing slashes, which should
-      // probably be fixed.  Since the only platform supporting install_name
-      // right now uses forward slashes just add one.
-      install_name_dir += "/";
       vars.TargetInstallNameDir = install_name_dir.c_str();
       }
     }



More information about the Cmake-commits mailing list