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.5 by greg, Wed May 30 18:31:11 2012 UTC vs.
Revision 1.21 by greg, Wed Jun 20 20:51:24 2018 UTC

# Line 1 | Line 1
1 < cmake_minimum_required(VERSION 2.8.4)
2 < project("radiance")
1 > cmake_minimum_required(VERSION 3.0)
2 > cmake_policy(SET CMP0020 NEW)
3 > cmake_policy(SET CMP0048 NEW)
4 > if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
5 >  cmake_policy(SET CMP0054 NEW)
6 > endif()
7  
8 + project(radiance VERSION 5.2.0)
9 +
10 + set(PROJECT_VERSION_TWEAK "Unknown" CACHE STRING "Commit Hash")
11 + find_package(Git)
12 + if(GIT_FOUND)
13 +  execute_process(COMMAND "${GIT_EXECUTABLE}" "rev-parse" "--short=10" "HEAD"
14 +    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
15 +    TIMEOUT 10
16 +    RESULT_VARIABLE RESULT
17 +    OUTPUT_VARIABLE GIT_VERSION
18 +    ERROR_QUIET
19 +    OUTPUT_STRIP_TRAILING_WHITESPACE
20 +  )
21 +  if(${RESULT} EQUAL 0 AND NOT "${GIT_VERSION}" EQUAL "${PROJECT_VERSION_TWEAK}")
22 +    set(PROJECT_VERSION_TWEAK ${GIT_VERSION} CACHE STRING "Commit Hash" FORCE)
23 +  endif()
24 + endif()
25 +
26   enable_testing()
27   include(CTest)
28  
29   option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
30 + option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
31 + option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
32 + option(BUILD_LIBTIFF "Build libtiff?" OFF)
33  
34   if(NOT WIN32)
35    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
36 <  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/man/ DESTINATION man)
36 >  install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
37 >  set(qt_plugin_term "PLUGIN")
38   endif()
39  
40 + if(WIN32)
41 +  set(CPACK_NSIS_MODIFY_PATH 1)
42 +  set(qt_plugin_term "LIBRARY")
43  
44 < if (WIN32)
44 >  # Set RAYPATH on install
45 >  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
46 >    "WriteRegExpandStr HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" RAYPATH '\\\$INSTDIR\\\\lib\\\;.'"
47 >  )
48  
49 <  set(CPACK_NSIS_MODIFY_PATH 0)
50 <
51 <  set(CPACK_BINARY_ZIP 1)
52 <
21 <  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "")
22 <
49 >  # Unset RAYPATH on uninstall
50 >  set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
51 >    "DeleteRegValue HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" RAYPATH"
52 >  )
53   endif()
54  
55   if(UNIX)
# Line 29 | Line 59 | else()
59    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
60   endif()
61  
62 + set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
63 +
64   if(APPLE)
65 +  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
66    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
67 <  include_directories(/usr/X11R6/include)
67 >  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
68   endif()
69  
70 < set(CPACK_PACKAGE_VERSION_MAJOR 4)
71 < set(CPACK_PACKAGE_VERSION_MINOR 2)
72 < set(CPACK_PACKAGE_VERSION_PATCH a)
70 > if(BUILD_LIBTIFF)
71 >  include(ExternalProject)
72 >  set(LIBTIFF_URL http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz)
73 >  set(LIBTIFF_MD5 54BAD211279CC93EB4FCA31BA9BFDC79)
74 >  if(WIN32)
75 >    ExternalProject_Add(libtiff
76 >      URL ${LIBTIFF_URL}
77 >      URL_MD5 ${LIBTIFF_MD5}
78 >      CMAKE_GENERATOR "NMake Makefiles"
79 >      CMAKE_ARGS
80 >        "-DBUILD_SHARED_LIBS=OFF"
81 >        "-DCMAKE_BUILD_TYPE=Release"
82 >        "-Dzlib=OFF"
83 >        "../libtiff"
84 >      INSTALL_COMMAND ""
85 >    )
86 >    set(TIFF_LIBRARY ${CMAKE_BINARY_DIR}/libtiff-prefix/src/libtiff-build/libtiff/tiff.lib)
87 >  else()
88 >    ExternalProject_Add(libtiff
89 >      URL ${LIBTIFF_URL}
90 >      URL_MD5 ${LIBTIFF_MD5}
91 >      CMAKE_ARGS
92 >        "-DBUILD_SHARED_LIBS=OFF"
93 >        "-DCMAKE_BUILD_TYPE=Release"
94 >        "-Dzlib=OFF"
95 >        "../libtiff"
96 >      INSTALL_COMMAND ""
97 >    )
98 >    set(TIFF_LIBRARY ${CMAKE_BINARY_DIR}/libtiff-prefix/src/libtiff-build/libtiff/libtiff.a)
99 >  endif()
100 >  set(TIFF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/libtiff/src/libtiff/libtiff)
101 > endif()
102 >
103 > set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
104 > set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
105   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
106 < SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
107 < SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
108 < SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt")
106 > set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
107 > set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
108 > set(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt")
109  
110 + if(APPLE)
111 +  set(CPACK_GENERATOR "PackageMaker")
112 + elseif(UNIX)
113 +  set(CPACK_GENERATOR "TGZ")
114 + endif()
115  
116   include(CPack)
117  
118 < find_package(Qt4 COMPONENTS QtCore QtGui)
119 < find_package(X11)
118 > if(NOT BUILD_HEADLESS)
119 >  find_package(Qt5Widgets)
120 >  get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
121 >  get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
122 >  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
123 >  find_package(X11)
124 >  if(APPLE)
125 >     include_directories(${X11_INCLUDE_DIR})
126 >  endif()
127 > endif()
128  
129 < SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
129 > set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
130  
131 + if(MSVC)
132 +  add_definitions(/MP)
133 + endif()
134   if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
135    set(_INTEL_WINDOWS 1)
136   endif()
# Line 62 | Line 143 | endif()
143  
144   add_subdirectory("src")
145  
146 < set(test_dir ${CMAKE_CURRENT_SOURCE_DIR}/test/test\ data)
66 < option(BUILD_TESTING "Download support tarball & enable testing?" ON)
146 > set(test_dir "${CMAKE_CURRENT_SOURCE_DIR}/test/test data")
147  
148 < if(BUILD_TESTING)
69 <  #download and extract radiance support files
70 <  include(ExternalProject)
71 <  set(base "${CMAKE_BINARY_DIR}/Downloads")
72 <  set_property(DIRECTORY PROPERTY EP_BASE ${base})
73 <  ExternalProject_Add(radiance_support
74 <    URL http://www.radiance-online.org/software/non-cvs/rad4R1supp.tar.gz
75 <    URL_MD5 efd82970e1d0747eede8eb64c01048f4
76 <    CONFIGURE_COMMAND ""
77 <    BUILD_COMMAND ""
78 <    INSTALL_COMMAND ""
79 <  )
148 > add_subdirectory(resources)
149  
150 <  #install support files.
151 <  set(lib_dir ${base}/Source/radiance_support/lib)
83 <  install(
84 <    FILES
85 <      ${lib_dir}/Earth.cal ${lib_dir}/He.cal ${lib_dir}/He3.cal
86 <      ${lib_dir}/adobe.cal ${lib_dir}/ball.cal ${lib_dir}/brick.cal
87 <      ${lib_dir}/brickweave.cal ${lib_dir}/carpet.cal ${lib_dir}/climit.cal
88 <      ${lib_dir}/corrug.cal ${lib_dir}/covelight.cal ${lib_dir}/cyl.cal
89 <      ${lib_dir}/dichroic.cal ${lib_dir}/dirt.cal ${lib_dir}/fisheye.cal
90 <      ${lib_dir}/fishgeom.cal ${lib_dir}/fprism.cal ${lib_dir}/globe.cal
91 <      ${lib_dir}/gloss.cal ${lib_dir}/grating.cal ${lib_dir}/jigglepic.cal
92 <      ${lib_dir}/lcp0.cal ${lib_dir}/limit.cal ${lib_dir}/marble.cal
93 <      ${lib_dir}/orange.cal ${lib_dir}/picture.cal ${lib_dir}/plink.cal
94 <      ${lib_dir}/prism.cal ${lib_dir}/retrorefl.cal ${lib_dir}/serraglaze.cal
95 <      ${lib_dir}/slate.cal ${lib_dir}/surf.cal ${lib_dir}/tim1.cal
96 <      ${lib_dir}/weave.cal ${lib_dir}/winxmit.cal ${lib_dir}/woodpat.cal
97 <      ${lib_dir}/woodtex.cal ${lib_dir}/wrinkle.cal
98 <      ${lib_dir}/page1.txt ${lib_dir}/page2.txt
99 <      ${lib_dir}/Pix.fnt
100 <      ${lib_dir}/PixOblique.fnt
101 <      ${lib_dir}/Veerdana.fnt
102 <      ${lib_dir}/VeerdanaBold.fnt
103 <      ${lib_dir}/VeerdanaBoldItalic.fnt
104 <      ${lib_dir}/VeerdanaItalic.fnt
105 <      ${lib_dir}/helvet.fnt
106 <      ${lib_dir}/hexbit4x1.fnt
107 <      ${test_dir}/model.oct
108 <      ${test_dir}/model.vp
109 <    DESTINATION lib
110 <  )
111 <
112 <  install(FILES ${lib_dir}/Earth.hdr DESTINATION lib RENAME Earth.pic)
113 <  install(FILES ${lib_dir}/EarthBig.hdr DESTINATION lib RENAME EarthBig.pic)
114 <  install(FILES ${lib_dir}/alberta.hdr DESTINATION lib RENAME alberta.pic)
115 <  install(FILES ${lib_dir}/brick.hdr DESTINATION lib RENAME brick.pic)
116 <  install(FILES ${lib_dir}/brickweave.hdr DESTINATION lib RENAME brickweave.pic)
117 <  install(FILES ${lib_dir}/cabin.hdr DESTINATION lib RENAME cabin.pic)
118 <  install(FILES ${lib_dir}/forestfl.hdr DESTINATION lib RENAME forestfl.pic)
119 <  install(FILES ${lib_dir}/oakfloor.hdr DESTINATION lib RENAME oakfloor.pic)
120 <  install(FILES ${lib_dir}/pine.hdr DESTINATION lib RENAME pine.pic)
121 <  install(FILES ${lib_dir}/pinebark.hdr DESTINATION lib RENAME pinebark.pic)
122 <  install(FILES ${lib_dir}/podlife.hdr DESTINATION lib RENAME podlife.pic)
123 <  install(FILES ${lib_dir}/richgrove.hdr DESTINATION lib RENAME richgrove.pic)
124 <  install(FILES ${lib_dir}/shingle.hdr DESTINATION lib RENAME shingle.pic)
125 <  install(FILES ${lib_dir}/summercab.hdr DESTINATION lib RENAME summercab.pic)
126 <  install(FILES ${lib_dir}/tulips.hdr DESTINATION lib RENAME tulips.pic)
127 <
128 <  add_subdirectory(cmake_tests)
129 < endif()
130 <  
131 < install(
132 <  FILES
133 <    ${test_dir}/model.oct
134 <    ${test_dir}/model.vp
135 <  DESTINATION lib
150 > install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
151 >  DESTINATION "lib"
152   )
153  
154   include(InstallRequiredSystemLibraries)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines