[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.8.2.1 1.8.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in changes from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Framework/CMakeLists.txt,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C 2 -d -r1.8.2.1 -r1.8.2.2
*** CMakeLists.txt	25 Mar 2008 23:59:13 -0000	1.8.2.1
--- CMakeLists.txt	8 Apr 2008 16:22:51 -0000	1.8.2.2
***************
*** 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...)