--- ray/CMakeLists.txt	2012/04/25 22:21:06	1.4
+++ ray/CMakeLists.txt	2012/05/30 18:31:11	1.5
@@ -26,7 +26,7 @@ if(UNIX)
   set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/radiance")
   add_definitions(-Dlinux -D_FILE_OFFSET_BITS=64 -DNOSTEREO)
 else()
-  set(CPACK_PACKAGING_INSTALL_PREFIX "/radiance")
+  set(CPACK_PACKAGING_INSTALL_PREFIX "/")
 endif()
 
 if(APPLE)
@@ -37,7 +37,7 @@ endif()
 set(CPACK_PACKAGE_VERSION_MAJOR 4)
 set(CPACK_PACKAGE_VERSION_MINOR 2)
 set(CPACK_PACKAGE_VERSION_PATCH a)
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
 SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
 SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt") 
@@ -62,67 +62,78 @@ endif()
 
 add_subdirectory("src")
 
-#download and extract radiance support files
-include(ExternalProject)
-set(base "${CMAKE_BINARY_DIR}/Downloads")
-set_property(DIRECTORY PROPERTY EP_BASE ${base})
-ExternalProject_Add(radiance_support
-  URL http://www.radiance-online.org/software/non-cvs/rad4R1supp.tar.gz
-  URL_MD5 efd82970e1d0747eede8eb64c01048f4
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-)
-
-#install support files.
-set(lib_dir ${base}/Source/radiance_support/lib)
 set(test_dir ${CMAKE_CURRENT_SOURCE_DIR}/test/test\ data)
+option(BUILD_TESTING "Download support tarball & enable testing?" ON)
+
+if(BUILD_TESTING)
+  #download and extract radiance support files
+  include(ExternalProject)
+  set(base "${CMAKE_BINARY_DIR}/Downloads")
+  set_property(DIRECTORY PROPERTY EP_BASE ${base})
+  ExternalProject_Add(radiance_support
+    URL http://www.radiance-online.org/software/non-cvs/rad4R1supp.tar.gz
+    URL_MD5 efd82970e1d0747eede8eb64c01048f4
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+  )
+
+  #install support files.
+  set(lib_dir ${base}/Source/radiance_support/lib)
+  install(
+    FILES
+      ${lib_dir}/Earth.cal ${lib_dir}/He.cal ${lib_dir}/He3.cal
+      ${lib_dir}/adobe.cal ${lib_dir}/ball.cal ${lib_dir}/brick.cal
+      ${lib_dir}/brickweave.cal ${lib_dir}/carpet.cal ${lib_dir}/climit.cal
+      ${lib_dir}/corrug.cal ${lib_dir}/covelight.cal ${lib_dir}/cyl.cal
+      ${lib_dir}/dichroic.cal ${lib_dir}/dirt.cal ${lib_dir}/fisheye.cal
+      ${lib_dir}/fishgeom.cal ${lib_dir}/fprism.cal ${lib_dir}/globe.cal
+      ${lib_dir}/gloss.cal ${lib_dir}/grating.cal ${lib_dir}/jigglepic.cal
+      ${lib_dir}/lcp0.cal ${lib_dir}/limit.cal ${lib_dir}/marble.cal
+      ${lib_dir}/orange.cal ${lib_dir}/picture.cal ${lib_dir}/plink.cal
+      ${lib_dir}/prism.cal ${lib_dir}/retrorefl.cal ${lib_dir}/serraglaze.cal
+      ${lib_dir}/slate.cal ${lib_dir}/surf.cal ${lib_dir}/tim1.cal
+      ${lib_dir}/weave.cal ${lib_dir}/winxmit.cal ${lib_dir}/woodpat.cal
+      ${lib_dir}/woodtex.cal ${lib_dir}/wrinkle.cal
+      ${lib_dir}/page1.txt ${lib_dir}/page2.txt
+      ${lib_dir}/Pix.fnt
+      ${lib_dir}/PixOblique.fnt
+      ${lib_dir}/Veerdana.fnt
+      ${lib_dir}/VeerdanaBold.fnt
+      ${lib_dir}/VeerdanaBoldItalic.fnt
+      ${lib_dir}/VeerdanaItalic.fnt
+      ${lib_dir}/helvet.fnt
+      ${lib_dir}/hexbit4x1.fnt
+      ${test_dir}/model.oct
+      ${test_dir}/model.vp
+    DESTINATION lib
+  )
+
+  install(FILES ${lib_dir}/Earth.hdr DESTINATION lib RENAME Earth.pic)
+  install(FILES ${lib_dir}/EarthBig.hdr DESTINATION lib RENAME EarthBig.pic)
+  install(FILES ${lib_dir}/alberta.hdr DESTINATION lib RENAME alberta.pic)
+  install(FILES ${lib_dir}/brick.hdr DESTINATION lib RENAME brick.pic)
+  install(FILES ${lib_dir}/brickweave.hdr DESTINATION lib RENAME brickweave.pic)
+  install(FILES ${lib_dir}/cabin.hdr DESTINATION lib RENAME cabin.pic)
+  install(FILES ${lib_dir}/forestfl.hdr DESTINATION lib RENAME forestfl.pic)
+  install(FILES ${lib_dir}/oakfloor.hdr DESTINATION lib RENAME oakfloor.pic)
+  install(FILES ${lib_dir}/pine.hdr DESTINATION lib RENAME pine.pic)
+  install(FILES ${lib_dir}/pinebark.hdr DESTINATION lib RENAME pinebark.pic)
+  install(FILES ${lib_dir}/podlife.hdr DESTINATION lib RENAME podlife.pic)
+  install(FILES ${lib_dir}/richgrove.hdr DESTINATION lib RENAME richgrove.pic)
+  install(FILES ${lib_dir}/shingle.hdr DESTINATION lib RENAME shingle.pic)
+  install(FILES ${lib_dir}/summercab.hdr DESTINATION lib RENAME summercab.pic)
+  install(FILES ${lib_dir}/tulips.hdr DESTINATION lib RENAME tulips.pic)
+
+  add_subdirectory(cmake_tests)
+endif()
+  
 install(
   FILES
-    ${lib_dir}/Earth.cal ${lib_dir}/He.cal ${lib_dir}/He3.cal
-    ${lib_dir}/adobe.cal ${lib_dir}/ball.cal ${lib_dir}/brick.cal
-    ${lib_dir}/brickweave.cal ${lib_dir}/carpet.cal ${lib_dir}/climit.cal
-    ${lib_dir}/corrug.cal ${lib_dir}/covelight.cal ${lib_dir}/cyl.cal
-    ${lib_dir}/dichroic.cal ${lib_dir}/dirt.cal ${lib_dir}/fisheye.cal
-    ${lib_dir}/fishgeom.cal ${lib_dir}/fprism.cal ${lib_dir}/globe.cal
-    ${lib_dir}/gloss.cal ${lib_dir}/grating.cal ${lib_dir}/jigglepic.cal
-    ${lib_dir}/lcp0.cal ${lib_dir}/limit.cal ${lib_dir}/marble.cal
-    ${lib_dir}/orange.cal ${lib_dir}/picture.cal ${lib_dir}/plink.cal
-    ${lib_dir}/prism.cal ${lib_dir}/retrorefl.cal ${lib_dir}/serraglaze.cal
-    ${lib_dir}/slate.cal ${lib_dir}/surf.cal ${lib_dir}/tim1.cal
-    ${lib_dir}/weave.cal ${lib_dir}/winxmit.cal ${lib_dir}/woodpat.cal
-    ${lib_dir}/woodtex.cal ${lib_dir}/wrinkle.cal
-    ${lib_dir}/page1.txt ${lib_dir}/page2.txt
-    ${lib_dir}/Pix.fnt
-    ${lib_dir}/PixOblique.fnt
-    ${lib_dir}/Veerdana.fnt
-    ${lib_dir}/VeerdanaBold.fnt
-    ${lib_dir}/VeerdanaBoldItalic.fnt
-    ${lib_dir}/VeerdanaItalic.fnt
-    ${lib_dir}/helvet.fnt
-    ${lib_dir}/hexbit4x1.fnt
     ${test_dir}/model.oct
     ${test_dir}/model.vp
   DESTINATION lib
 )
-
-install(FILES ${lib_dir}/Earth.hdr DESTINATION lib RENAME Earth.pic)
-install(FILES ${lib_dir}/EarthBig.hdr DESTINATION lib RENAME EarthBig.pic)
-install(FILES ${lib_dir}/alberta.hdr DESTINATION lib RENAME alberta.pic)
-install(FILES ${lib_dir}/brick.hdr DESTINATION lib RENAME brick.pic)
-install(FILES ${lib_dir}/brickweave.hdr DESTINATION lib RENAME brickweave.pic)
-install(FILES ${lib_dir}/cabin.hdr DESTINATION lib RENAME cabin.pic)
-install(FILES ${lib_dir}/forestfl.hdr DESTINATION lib RENAME forestfl.pic)
-install(FILES ${lib_dir}/oakfloor.hdr DESTINATION lib RENAME oakfloor.pic)
-install(FILES ${lib_dir}/pine.hdr DESTINATION lib RENAME pine.pic)
-install(FILES ${lib_dir}/pinebark.hdr DESTINATION lib RENAME pinebark.pic)
-install(FILES ${lib_dir}/podlife.hdr DESTINATION lib RENAME podlife.pic)
-install(FILES ${lib_dir}/richgrove.hdr DESTINATION lib RENAME richgrove.pic)
-install(FILES ${lib_dir}/shingle.hdr DESTINATION lib RENAME shingle.pic)
-install(FILES ${lib_dir}/summercab.hdr DESTINATION lib RENAME summercab.pic)
-install(FILES ${lib_dir}/tulips.hdr DESTINATION lib RENAME tulips.pic)
-
-add_subdirectory(cmake_tests)
 
 include(InstallRequiredSystemLibraries)
 add_subdirectory(InstallRules)