[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.2 1.2.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/BundleTest/BundleSubDir
In directory public:/mounts/ram/cvs-serv18450/Tests/BundleTest/BundleSubDir

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


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/BundleTest/BundleSubDir/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** CMakeLists.txt	24 Aug 2007 17:30:41 -0000	1.2
--- CMakeLists.txt	3 Sep 2008 13:43:22 -0000	1.2.2.1
***************
*** 13,17 ****
  SET_SOURCE_FILES_PROPERTIES(
    "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt"
!   "${CMake_SOURCE_DIR}/ChangeLog.txt"
    PROPERTIES
    MACOSX_PACKAGE_LOCATION MacOS
--- 13,17 ----
  SET_SOURCE_FILES_PROPERTIES(
    "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt"
!   "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt"
    PROPERTIES
    MACOSX_PACKAGE_LOCATION MacOS
***************
*** 22,30 ****
    "${BundleTest_SOURCE_DIR}/BundleTest.cxx"
    "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt"
!   "${CMake_SOURCE_DIR}/ChangeLog.txt"
    "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist"
    )
  TARGET_LINK_LIBRARIES(SecondBundle BundleTestLib)
!  
  # Test bundle installation.
  INSTALL(TARGETS SecondBundle DESTINATION Applications)
--- 22,30 ----
    "${BundleTest_SOURCE_DIR}/BundleTest.cxx"
    "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt"
!   "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt"
    "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist"
    )
  TARGET_LINK_LIBRARIES(SecondBundle BundleTestLib)
! 
  # Test bundle installation.
  INSTALL(TARGETS SecondBundle DESTINATION Applications)