summaryrefslogtreecommitdiffstats
path: root/Source/cmSetSourceFilesPropertiesCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-02-15 16:22:23 (GMT)
committerBrad King <brad.king@kitware.com>2008-02-15 16:22:23 (GMT)
commited76198b840b83d49ee4eba9ca0c7753b41d54cf (patch)
tree9ccd1f187874b7adc0f79d9f7c5088fa62e6639c /Source/cmSetSourceFilesPropertiesCommand.cxx
parent6ea4eea18387d414d6a982bff3bd2f56cdaa85a5 (diff)
downloadCMake-ed76198b840b83d49ee4eba9ca0c7753b41d54cf.zip
CMake-ed76198b840b83d49ee4eba9ca0c7753b41d54cf.tar.gz
CMake-ed76198b840b83d49ee4eba9ca0c7753b41d54cf.tar.bz2
ENH: Cleanup building of OS X bundle content
- Fixes repeated rebuild of bundles by Makefile generators - Add special rules to copy sources to their MACOSX_PACKAGE_LOCATION bundle directory - Remove MacOSX_Content language hack - Remove EXTRA_CONTENT property - Remove MACOSX_CONTENT - Remove corresponding special cases in object names
Diffstat (limited to 'Source/cmSetSourceFilesPropertiesCommand.cxx')
-rw-r--r--Source/cmSetSourceFilesPropertiesCommand.cxx27
1 files changed, 1 insertions, 26 deletions
diff --git a/Source/cmSetSourceFilesPropertiesCommand.cxx b/Source/cmSetSourceFilesPropertiesCommand.cxx
index 9c6153b..92d54ca 100644
--- a/Source/cmSetSourceFilesPropertiesCommand.cxx
+++ b/Source/cmSetSourceFilesPropertiesCommand.cxx
@@ -119,7 +119,6 @@ bool cmSetSourceFilesPropertiesCommand
{
// now loop through the rest of the arguments, new style
++j;
- bool dontPush = false;
while (j != propend)
{
propertyPairs.push_back(*j);
@@ -131,26 +130,6 @@ bool cmSetSourceFilesPropertiesCommand
generated = true;
}
}
- else if(*j == "MACOSX_PACKAGE_LOCATION")
- {
- ++j;
- if(j == propend)
- {
- errors = "called with incorrect number of arguments "
- "MACOSX_PACKAGE_LOCATION with no flags";
- return false;
- }
- propertyPairs.push_back(*j);
- propertyPairs.push_back("EXTRA_CONTENT");
- propertyPairs.push_back("1");
- propertyPairs.push_back("MACOSX_CONTENT");
- propertyPairs.push_back("1");
- propertyPairs.push_back("KEEP_EXTENSION");
- propertyPairs.push_back("1");
- propertyPairs.push_back("LANGUAGE");
- propertyPairs.push_back("MacOSX_Content");
- dontPush = true;
- }
else
{
++j;
@@ -160,12 +139,8 @@ bool cmSetSourceFilesPropertiesCommand
errors = "called with incorrect number of arguments.";
return false;
}
- if ( !dontPush )
- {
- propertyPairs.push_back(*j);
- }
+ propertyPairs.push_back(*j);
++j;
- dontPush = false;
}
// break out of the loop because j is already == end
break;