[cmake-commits] david.cole committed CMakeLists.txt 1.4 1.5 fooBoth.h NONE 1.1 fooNeither.h NONE 1.1 fooPrivate.h NONE 1.1 fooPublic.h NONE 1.1 test.lua 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Framework
In directory public:/mounts/ram/cvs-serv22147/Tests/Framework

Modified Files:
	CMakeLists.txt test.lua 
Added Files:
	fooBoth.h fooNeither.h fooPrivate.h fooPublic.h 
Log Message:
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.


--- NEW FILE: fooPrivate.h ---
fooPrivateh

--- NEW FILE: fooPublic.h ---
fooPublich

--- NEW FILE: fooBoth.h ---
fooBothh

Index: test.lua
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Framework/test.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test.lua	4 Jun 2007 21:18:31 -0000	1.1
+++ test.lua	14 Aug 2007 15:45:15 -0000	1.2
@@ -0,0 +1 @@
+test.lua

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Framework/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CMakeLists.txt	1 Aug 2007 17:04:45 -0000	1.4
+++ CMakeLists.txt	14 Aug 2007 15:45:15 -0000	1.5
@@ -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 @@
 # 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)

--- NEW FILE: fooNeither.h ---
fooNeitherh