[Cmake-commits] [cmake-commits] king committed cmTarget.cxx 1.283 1.284

[cmake-commits at cmake.org]

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

Modified Files:
	cmTarget.cxx 
Log Message:
Introduce per-config OUTPUT_DIRECTORY properties

We create per-configuration target properties to specify ARCHIVE,
LIBRARY, and RUNTIME output directories.  The properties override the
generic properties for the <CONFIG> configuration:

  ARCHIVE_OUTPUT_DIRECTORY -> ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>
  LIBRARY_OUTPUT_DIRECTORY -> LIBRARY_OUTPUT_DIRECTORY_<CONFIG>
  RUNTIME_OUTPUT_DIRECTORY -> RUNTIME_OUTPUT_DIRECTORY_<CONFIG>

For multi-configuration generators, the per-configuration subdirectory
normally appended to the generic output directory is not added to the
configuration-specific property values.  This allows projects to set the
exact location at which binaries will be placed for each configuration.

See issue #9163.


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.283
retrieving revision 1.284
diff -C 2 -d -r1.283 -r1.284
*** cmTarget.cxx	28 Oct 2009 17:34:59 -0000	1.283
--- cmTarget.cxx	28 Oct 2009 17:35:25 -0000	1.284
***************
*** 902,909 ****
--- 902,919 ----
       "This property specifies the directory into which " #type " target "   \
       "files should be built. "                                              \
+      "Multi-configuration generators (VS, Xcode) append "                   \
+      "a per-configuration subdirectory to the specified directory.  "       \
       CM_TARGET_FILE_TYPES_DOC "  "                                          \
       "This property is initialized by the value of the variable "           \
       "CMAKE_" #TYPE "_OUTPUT_DIRECTORY if it is set when a target is created."
  
+ #define CM_TARGET_OUTDIR_CONFIG_DOC(TYPE)                                   \
+      "This is a per-configuration version of " #TYPE "_OUTPUT_DIRECTORY, "  \
+      "but multi-configuration generators (VS, Xcode) do NOT append "        \
+      "a per-configuration subdirectory to the specified directory.  "       \
+      "This property is initialized by the value of the variable "           \
+      "CMAKE_" #TYPE "_OUTPUT_DIRECTORY_<CONFIG> "                           \
+      "if it is set when a target is created."
+ 
    cm->DefineProperty
      ("ARCHIVE_OUTPUT_DIRECTORY", cmProperty::TARGET,
***************
*** 911,921 ****
--- 921,943 ----
       CM_TARGET_OUTDIR_DOC(ARCHIVE, archive));
    cm->DefineProperty
+     ("ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>", cmProperty::TARGET,
+      "Per-configuration output directory for ARCHIVE target files.",
+      CM_TARGET_OUTDIR_CONFIG_DOC(ARCHIVE));
+   cm->DefineProperty
      ("LIBRARY_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build LIBRARY target files.",
       CM_TARGET_OUTDIR_DOC(LIBRARY, library));
    cm->DefineProperty
+     ("LIBRARY_OUTPUT_DIRECTORY_<CONFIG>", cmProperty::TARGET,
+      "Per-configuration output directory for LIBRARY target files.",
+      CM_TARGET_OUTDIR_CONFIG_DOC(LIBRARY));
+   cm->DefineProperty
      ("RUNTIME_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build RUNTIME target files.",
       CM_TARGET_OUTDIR_DOC(RUNTIME, runtime));
+   cm->DefineProperty
+     ("RUNTIME_OUTPUT_DIRECTORY_<CONFIG>", cmProperty::TARGET,
+      "Per-configuration output directory for RUNTIME target files.",
+      CM_TARGET_OUTDIR_CONFIG_DOC(RUNTIME));
  
    cm->DefineProperty
***************
*** 1019,1025 ****
--- 1041,1060 ----
  
    // Setup per-configuration property default values.
+   const char* configProps[] = {
+     "ARCHIVE_OUTPUT_DIRECTORY_",
+     "LIBRARY_OUTPUT_DIRECTORY_",
+     "RUNTIME_OUTPUT_DIRECTORY_",
+     0};
    for(std::vector<std::string>::iterator ci = configNames.begin();
        ci != configNames.end(); ++ci)
      {
+     std::string configUpper = cmSystemTools::UpperCase(*ci);
+     for(const char** p = configProps; *p; ++p)
+       {
+       std::string property = *p;
+       property += configUpper;
+       this->SetPropertyDefault(property.c_str(), 0);
+       }
+ 
      // Initialize per-configuration name postfix property from the
      // variable only for non-executable targets.  This preserves
***************
*** 3527,3532 ****
    // Look for a target property defining the target output directory
    // based on the target type.
    const char* propertyName = 0;
!   std::string propertyNameStr = this->GetOutputTargetType(implib);
    if(!propertyNameStr.empty())
      {
--- 3562,3568 ----
    // Look for a target property defining the target output directory
    // based on the target type.
+   std::string targetTypeName = this->GetOutputTargetType(implib);
    const char* propertyName = 0;
!   std::string propertyNameStr = targetTypeName;
    if(!propertyNameStr.empty())
      {
***************
*** 3535,3540 ****
      }
  
    // Select an output directory.
!   if(const char* outdir = this->GetProperty(propertyName))
      {
      // Use the user-specified output directory.
--- 3571,3595 ----
      }
  
+   // Check for a per-configuration output directory target property.
+   std::string configUpper = cmSystemTools::UpperCase(config? config : "");
+   const char* configProp = 0;
+   std::string configPropStr = targetTypeName;
+   if(!configPropStr.empty())
+     {
+     configPropStr += "_OUTPUT_DIRECTORY_";
+     configPropStr += configUpper;
+     configProp = configPropStr.c_str();
+     }
+ 
    // Select an output directory.
!   if(const char* config_outdir = this->GetProperty(configProp))
!     {
!     // Use the user-specified per-configuration output directory.
!     out = config_outdir;
! 
!     // Skip per-configuration subdirectory.
!     config = 0;
!     }
!   else if(const char* outdir = this->GetProperty(propertyName))
      {
      // Use the user-specified output directory.