ENH: Improvements to the Xcode generator. Build frameworks using native Copy Headers and Copy Bundle Resources phases. Fix bugs: eliminate folders with no names, ensure source files show up in multiple targets, remove empty utility targets from Sources subtrees, ensure that fileRefs only show up once in each grouping folder.

6 files changed, 38 insertions, 8 deletions

diff --git a/Tests/Framework/CMakeLists.txt b/Tests/Framework/CMakeLists.txt
index 8264505..f1f82cb 100644
--- a/Tests/Framework/CMakeLists.txt
+++ b/Tests/Framework/CMakeLists.txt
@@ -1,11 +1,29 @@
 project(Framework)
 
-add_library(foo SHARED foo.cxx foo.h)
+add_library(foo SHARED
+  foo.cxx
+  foo.h
+  foo2.h
+  fooPublic.h
+  fooPrivate.h
+  fooNeither.h
+  fooBoth.h
+  test.lua
+)
 set_target_properties(foo PROPERTIES
   FRAMEWORK TRUE
-  FRAMEWORK_PUBLIC_HEADERS "foo.h;foo2.h"
-  FRAMEWORK_VERSION ver2
-  FRAMEWORK_RESOURCES "test.lua"
+  FRAMEWORK_VERSION ver3
+)
+# fooNeither.h is marked neither public nor private...
+# fooBoth.h is marked both public and private... (private wins...)
+set_source_files_properties(foo.h foo2.h fooPublic.h fooBoth.h PROPERTIES
+  FRAMEWORK_PUBLIC_HEADER TRUE
+)
+set_source_files_properties(fooPrivate.h fooBoth.h PROPERTIES
+  FRAMEWORK_PRIVATE_HEADER TRUE
+)
+set_source_files_properties(test.lua PROPERTIES
+  FRAMEWORK_RESOURCE TRUE
 )
 add_executable(bar bar.cxx)
 target_link_libraries(bar foo)
@@ -16,12 +34,19 @@ target_link_libraries(bar foo)
 # a framework... The framework properties only apply when the library type
 # is SHARED.
 #
-add_library(fooStatic STATIC foo.cxx foo.h)
+add_library(fooStatic STATIC
+  foo.cxx
+  foo.h
+  foo2.h
+  fooPublic.h
+  fooPrivate.h
+  fooNeither.h
+  fooBoth.h
+  test.lua
+)
 set_target_properties(fooStatic PROPERTIES
   FRAMEWORK TRUE
-  FRAMEWORK_PUBLIC_HEADERS "foo.h;foo2.h"
-  FRAMEWORK_VERSION ver2
-  FRAMEWORK_RESOURCES "test.lua"
+  FRAMEWORK_VERSION none
 )
 add_executable(barStatic bar.cxx)
 target_link_libraries(barStatic fooStatic)
diff --git a/Tests/Framework/fooBoth.h b/Tests/Framework/fooBoth.h
new file mode 100644
index 0000000..5a0f330
--- /dev/null
+++ b/Tests/Framework/fooBoth.h
@@ -0,0 +1 @@
+fooBothh
diff --git a/Tests/Framework/fooNeither.h b/Tests/Framework/fooNeither.h
new file mode 100644
index 0000000..04736a1
--- /dev/null
+++ b/Tests/Framework/fooNeither.h
@@ -0,0 +1 @@
+fooNeitherh
diff --git a/Tests/Framework/fooPrivate.h b/Tests/Framework/fooPrivate.h
new file mode 100644
index 0000000..dc8cb34
--- /dev/null
+++ b/Tests/Framework/fooPrivate.h
@@ -0,0 +1 @@
+fooPrivateh
diff --git a/Tests/Framework/fooPublic.h b/Tests/Framework/fooPublic.h
new file mode 100644
index 0000000..f0469de
--- /dev/null
+++ b/Tests/Framework/fooPublic.h
@@ -0,0 +1 @@
+fooPublich
diff --git a/Tests/Framework/test.lua b/Tests/Framework/test.lua
index e69de29..ce5c3eb 100644
--- a/Tests/Framework/test.lua
+++ b/Tests/Framework/test.lua
@@ -0,0 +1 @@
+test.lua