[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.9 1.10 fooDeepPublic.h NONE 1.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Apr 8 00:06:49 EDT 2008
Update of /cvsroot/CMake/CMake/Tests/Framework
In directory public:/mounts/ram/cvs-serv18087/Tests/Framework
Modified Files:
CMakeLists.txt
Added Files:
fooDeepPublic.h
Log Message:
BUG: Correct Mac OS X framework behavior
- Place the built library in foo.framework/Versions/A/foo
- Do not create unused content symlinks (like PrivateHeaders)
- Do not use VERSION/SOVERSION properties for frameworks
- Make cmTarget::GetDirectory return by value
- Remove the foo.framework part from cmTarget::GetDirectory
- Correct install_name construction and conversion on install
- Fix MACOSX_PACKAGE_LOCATION under Xcode to use the
Versions/<version> directory for frameworks
- Update the Framework test to try these things
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Framework/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CMakeLists.txt 25 Mar 2008 15:26:51 -0000 1.9
--- CMakeLists.txt 8 Apr 2008 04:06:47 -0000 1.10
***************
*** 11,16 ****
fooBoth.h
test.lua
)
!
set(foo_ver ver4)
--- 11,19 ----
fooBoth.h
test.lua
+ fooDeepPublic.h
)
! set_property(SOURCE fooDeepPublic.h
! PROPERTY MACOSX_PACKAGE_LOCATION Headers/Deep
! )
set(foo_ver ver4)
***************
*** 21,24 ****
--- 24,28 ----
PUBLIC_HEADER "foo.h;foo2.h;fooPublic.h;fooBoth.h"
RESOURCE "test.lua"
+ INSTALL_NAME_DIR "@executable_path/../../../Library/Frameworks"
)
# fooBoth.h is listed as both public and private... (private wins...)
--- NEW FILE: fooDeepPublic.h ---
fooDeepPublic
More information about the Cmake-commits
mailing list