[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.48.2.2 1.48.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in stuff from cvs head RC 16 


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -C 2 -d -r1.48.2.2 -r1.48.2.3
*** CMakeLists.txt	25 Jun 2008 13:51:50 -0000	1.48.2.2
--- CMakeLists.txt	31 Jul 2008 15:52:24 -0000	1.48.2.3
***************
*** 706,709 ****
--- 706,723 ----
    ENDIF (APPLE AND CMAKE_COMPILER_IS_GNUCXX)
  
+   IF(APPLE AND CTEST_TEST_CPACK)
+     ADD_TEST(BundleGeneratorTest ${CMAKE_CTEST_COMMAND}
+       --build-and-test
+       "${CMake_SOURCE_DIR}/Tests/BundleGeneratorTest"
+       "${CMake_BINARY_DIR}/Tests/BundleGeneratorTest"
+       --build-two-config
+       --build-generator ${CMAKE_TEST_GENERATOR}
+       --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} 
+       --build-project BundleGeneratorTest
+       --build-target package
+       --build-options "-DCMAKE_INSTALL_PREFIX:PATH=${CMake_BINARY_DIR}/Tests/BundleGeneratorTest/InstallDirectory"
+       )
+   ENDIF(APPLE AND CTEST_TEST_CPACK)
+ 
    IF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
      CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest/test.cmake.in"