ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/CMakeLists.txt
(Generate patch)

Comparing ray/CMakeLists.txt (file contents):
Revision 1.3 by greg, Wed Oct 26 16:48:01 2011 UTC vs.
Revision 1.4 by greg, Wed Apr 25 22:21:06 2012 UTC

# Line 7 | Line 7 | include(CTest)
7   option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
8  
9   if(NOT WIN32)
10 <  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
10 >  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
11 >  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/man/ DESTINATION man)
12   endif()
13 < set(CPACK_PACKAGING_INSTALL_PREFIX "/")
13 >
14 >
15 > if (WIN32)
16 >
17 >  set(CPACK_NSIS_MODIFY_PATH 0)
18 >
19 >  set(CPACK_BINARY_ZIP 1)
20 >
21 >  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "")
22 >
23 > endif()
24 >
25 > if(UNIX)
26 >  set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/radiance")
27 >  add_definitions(-Dlinux -D_FILE_OFFSET_BITS=64 -DNOSTEREO)
28 > else()
29 >  set(CPACK_PACKAGING_INSTALL_PREFIX "/radiance")
30 > endif()
31 >
32 > if(APPLE)
33 >  add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
34 >  include_directories(/usr/X11R6/include)
35 > endif()
36 >
37   set(CPACK_PACKAGE_VERSION_MAJOR 4)
38 < set(CPACK_PACKAGE_VERSION_MINOR 1)
39 < set(CPACK_PACKAGE_VERSION_PATCH 0)
40 < set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
38 > set(CPACK_PACKAGE_VERSION_MINOR 2)
39 > set(CPACK_PACKAGE_VERSION_PATCH a)
40 > set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}")
41   SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
42 < SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README")
42 > SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
43   SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt")
44 +
45 +
46   include(CPack)
47  
48   find_package(Qt4 COMPONENTS QtCore QtGui)
49 + find_package(X11)
50  
51   SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
52  
# Line 40 | Line 67 | include(ExternalProject)
67   set(base "${CMAKE_BINARY_DIR}/Downloads")
68   set_property(DIRECTORY PROPERTY EP_BASE ${base})
69   ExternalProject_Add(radiance_support
70 <  URL http://www.radiance-online.org/software/non-cvs/rad4R0supp.tar.gz
71 <  URL_MD5 123e3e40af59c8b246e1fdbf0661e877
70 >  URL http://www.radiance-online.org/software/non-cvs/rad4R1supp.tar.gz
71 >  URL_MD5 efd82970e1d0747eede8eb64c01048f4
72    CONFIGURE_COMMAND ""
73    BUILD_COMMAND ""
74    INSTALL_COMMAND ""
# Line 76 | Line 103 | install(
103      ${lib_dir}/hexbit4x1.fnt
104      ${test_dir}/model.oct
105      ${test_dir}/model.vp
106 <  DESTINATION bin
106 >  DESTINATION lib
107   )
108  
109 < install(FILES ${lib_dir}/Earth.hdr DESTINATION bin RENAME Earth.pic)
110 < install(FILES ${lib_dir}/EarthBig.hdr DESTINATION bin RENAME EarthBig.pic)
111 < install(FILES ${lib_dir}/alberta.hdr DESTINATION bin RENAME alberta.pic)
112 < install(FILES ${lib_dir}/brick.hdr DESTINATION bin RENAME brick.pic)
113 < install(FILES ${lib_dir}/brickweave.hdr DESTINATION bin RENAME brickweave.pic)
114 < install(FILES ${lib_dir}/cabin.hdr DESTINATION bin RENAME cabin.pic)
115 < install(FILES ${lib_dir}/forestfl.hdr DESTINATION bin RENAME forestfl.pic)
116 < install(FILES ${lib_dir}/oakfloor.hdr DESTINATION bin RENAME oakfloor.pic)
117 < install(FILES ${lib_dir}/pine.hdr DESTINATION bin RENAME pine.pic)
118 < install(FILES ${lib_dir}/pinebark.hdr DESTINATION bin RENAME pinebark.pic)
119 < install(FILES ${lib_dir}/podlife.hdr DESTINATION bin RENAME podlife.pic)
120 < install(FILES ${lib_dir}/richgrove.hdr DESTINATION bin RENAME richgrove.pic)
121 < install(FILES ${lib_dir}/shingle.hdr DESTINATION bin RENAME shingle.pic)
122 < install(FILES ${lib_dir}/summercab.hdr DESTINATION bin RENAME summercab.pic)
123 < install(FILES ${lib_dir}/tulips.hdr DESTINATION bin RENAME tulips.pic)
109 > install(FILES ${lib_dir}/Earth.hdr DESTINATION lib RENAME Earth.pic)
110 > install(FILES ${lib_dir}/EarthBig.hdr DESTINATION lib RENAME EarthBig.pic)
111 > install(FILES ${lib_dir}/alberta.hdr DESTINATION lib RENAME alberta.pic)
112 > install(FILES ${lib_dir}/brick.hdr DESTINATION lib RENAME brick.pic)
113 > install(FILES ${lib_dir}/brickweave.hdr DESTINATION lib RENAME brickweave.pic)
114 > install(FILES ${lib_dir}/cabin.hdr DESTINATION lib RENAME cabin.pic)
115 > install(FILES ${lib_dir}/forestfl.hdr DESTINATION lib RENAME forestfl.pic)
116 > install(FILES ${lib_dir}/oakfloor.hdr DESTINATION lib RENAME oakfloor.pic)
117 > install(FILES ${lib_dir}/pine.hdr DESTINATION lib RENAME pine.pic)
118 > install(FILES ${lib_dir}/pinebark.hdr DESTINATION lib RENAME pinebark.pic)
119 > install(FILES ${lib_dir}/podlife.hdr DESTINATION lib RENAME podlife.pic)
120 > install(FILES ${lib_dir}/richgrove.hdr DESTINATION lib RENAME richgrove.pic)
121 > install(FILES ${lib_dir}/shingle.hdr DESTINATION lib RENAME shingle.pic)
122 > install(FILES ${lib_dir}/summercab.hdr DESTINATION lib RENAME summercab.pic)
123 > install(FILES ${lib_dir}/tulips.hdr DESTINATION lib RENAME tulips.pic)
124  
125   add_subdirectory(cmake_tests)
126  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines