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.15 by greg, Fri May 8 18:07:38 2015 UTC vs.
Revision 1.27 by greg, Tue May 16 22:58:18 2023 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 < if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.11")
9 <  cmake_policy(SET CMP0020 NEW)
10 <  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0")
11 <    cmake_policy(SET CMP0042 NEW)
12 <    if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
13 <      cmake_policy(SET CMP0054 NEW)
14 <    endif()
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  
# Line 16 | Line 28 | 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 + option(BUILD_QT "Build Qt related stuff?" OFF)
34  
20 – option(CPACK_NREL_SUPPORT "Include OpenStudio ToolFinder Help?" OFF)
21 –
22 – if( CPACK_NREL_SUPPORT )
23 –  # find git so we can query for the current git tag
24 –  find_program(git git)
25 –  if (NOT git)
26 –    message(ERROR "Please specify the path to the git executable")
27 –  endif()
28 –
29 –  # call git log to get output containing the tag
30 –  execute_process(
31 –    COMMAND ${git} describe --tag --exact-match
32 –    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
33 –    OUTPUT_VARIABLE git_tag_output)
34 –
35 –  # create & install the source version .txt file
36 –  file(WRITE "NREL_ver.txt" "Radiance version ${git_tag_output}")
37 –  install(FILES NREL_ver.txt DESTINATION bin/..)
38 – endif()
39 –
35   if(NOT WIN32)
36    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
37 <  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/man/ DESTINATION man)
38 <  set(qt_plugin_term "PLUGIN")
37 >  install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
38 >  if(BUILD_QT)
39 >    set(qt_plugin_term "PLUGIN")
40 >  endif()
41   endif()
42  
43 < if (WIN32)
43 > if(WIN32)
44 >  set(CPACK_NSIS_INSTALL_ROOT "C:")
45    set(CPACK_NSIS_MODIFY_PATH 1)
46 <  set(qt_plugin_term "LIBRARY")
46 >  if(BUILD_QT)
47 >    set(qt_plugin_term "LIBRARY")
48 >  endif()
49  
50    # Set RAYPATH on install
51    set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
# Line 65 | Line 65 | else()
65    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
66   endif()
67  
68 + set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
69 +
70   if(APPLE)
71 +  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
72    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
73 <  include_directories(/usr/X11R6/include)
71 <  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6")
73 >  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
74   endif()
75  
76 < IF( BUILD_PACKAGE )
77 <  INCLUDE(radianceCPack.cmake )
78 < ENDIF( BUILD_PACKAGE )
76 > if(BUILD_LIBTIFF)
77 >  include(ExternalProject)
78 >  set(LIBTIFF_URL http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz)
79 >  set(LIBTIFF_MD5 54BAD211279CC93EB4FCA31BA9BFDC79)
80 >  if(WIN32)
81 >    ExternalProject_Add(libtiff
82 >      URL ${LIBTIFF_URL}
83 >      URL_MD5 ${LIBTIFF_MD5}
84 >      CMAKE_GENERATOR "NMake Makefiles"
85 >      CMAKE_ARGS
86 >        "-UHAVE_UNISTD_H"
87 >        "-DBUILD_SHARED_LIBS=OFF"
88 >        "-DCMAKE_BUILD_TYPE=Release"
89 >        "-Dzlib=OFF"
90 >        "../libtiff"
91 >      INSTALL_COMMAND ""
92 >    )
93 >    set(TIFF_LIBRARY ${CMAKE_BINARY_DIR}/libtiff-prefix/src/libtiff-build/libtiff/tiff.lib)
94 >  else()
95 >    ExternalProject_Add(libtiff
96 >      URL ${LIBTIFF_URL}
97 >      URL_MD5 ${LIBTIFF_MD5}
98 >      CMAKE_ARGS
99 >        "-DBUILD_SHARED_LIBS=OFF"
100 >        "-DCMAKE_BUILD_TYPE=Release"
101 >        "-Dzlib=OFF"
102 >        "../libtiff"
103 >      INSTALL_COMMAND ""
104 >    )
105 >    set(TIFF_LIBRARY ${CMAKE_BINARY_DIR}/libtiff-prefix/src/libtiff-build/libtiff/libtiff.a)
106 >  endif()
107 >  set(TIFF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/libtiff/src/libtiff/libtiff)
108 > endif()
109  
110 < set(CPACK_PACKAGE_VERSION_MAJOR 5)
111 < set(CPACK_PACKAGE_VERSION_MINOR 0)
80 < set(CPACK_PACKAGE_VERSION_PATCH a)
110 > set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
111 > set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
112   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
113 < SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
114 < SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
115 < SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt")
113 > set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
114 > set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
115 > set(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt")
116  
117 + if(APPLE)
118 +  set(CPACK_GENERATOR "PackageMaker")
119 + elseif(UNIX)
120 +  set(CPACK_GENERATOR "TGZ")
121 + endif()
122  
123   include(CPack)
124  
125   if(NOT BUILD_HEADLESS)
126 <  find_package(Qt5Widgets)
126 >  if(BUILD_QT)
127 >    find_package(Qt5Widgets)
128 >    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
129 >    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
130 >    get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
131 >  endif()
132    find_package(X11)
133 +  if(APPLE)
134 +     include_directories(${X11_INCLUDE_DIR})
135 +  endif()
136   endif()
137  
138 < SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
138 > set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
139  
140 + if(MSVC)
141 +  add_definitions(/MP)
142 +  # Suppress warnings about double-to-float assignments and initializations
143 +  add_compile_options(/wd"4244" /wd"4305")
144 + endif()
145   if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
146    set(_INTEL_WINDOWS 1)
147   endif()
# Line 105 | Line 154 | endif()
154  
155   add_subdirectory("src")
156  
157 < set(test_dir ${CMAKE_CURRENT_SOURCE_DIR}/test/test\ data)
109 < option(BUILD_TESTING "Download support tarball & enable testing?" ON)
157 > set(test_dir "${CMAKE_CURRENT_SOURCE_DIR}/test/test data")
158  
159 < if(BUILD_TESTING)
112 <  #download and extract radiance support files
113 <  include(ExternalProject)
114 <  set(base "${CMAKE_BINARY_DIR}/Downloads")
115 <  set_property(DIRECTORY PROPERTY EP_BASE ${base})
116 <  ExternalProject_Add(radiance_support
117 <    URL http://www.radiance-online.org/software/non-cvs/rad4R1supp.tar.gz
118 <    URL_MD5 efd82970e1d0747eede8eb64c01048f4
119 <    CONFIGURE_COMMAND ""
120 <    BUILD_COMMAND ""
121 <    INSTALL_COMMAND ""
122 <  )
159 > add_subdirectory(resources)
160  
161 <  #install support files.
162 <  set(lib_dir ${base}/Source/radiance_support/lib)
163 <  install(
127 <    FILES
128 <      ${lib_dir}/Earth.cal ${lib_dir}/He.cal ${lib_dir}/He3.cal
129 <      ${lib_dir}/adobe.cal ${lib_dir}/ball.cal ${lib_dir}/brick.cal
130 <      ${lib_dir}/brickweave.cal ${lib_dir}/carpet.cal ${lib_dir}/climit.cal
131 <      ${lib_dir}/corrug.cal ${lib_dir}/covelight.cal ${lib_dir}/cyl.cal
132 <      ${lib_dir}/dichroic.cal ${lib_dir}/dirt.cal ${lib_dir}/fisheye.cal
133 <      ${lib_dir}/fishgeom.cal ${lib_dir}/fprism.cal ${lib_dir}/globe.cal
134 <      ${lib_dir}/gloss.cal ${lib_dir}/grating.cal ${lib_dir}/jigglepic.cal
135 <      ${lib_dir}/lcp0.cal ${lib_dir}/limit.cal ${lib_dir}/marble.cal
136 <      ${lib_dir}/orange.cal ${lib_dir}/picture.cal ${lib_dir}/plink.cal
137 <      ${lib_dir}/prism.cal ${lib_dir}/retrorefl.cal ${lib_dir}/serraglaze.cal
138 <      ${lib_dir}/slate.cal ${lib_dir}/surf.cal ${lib_dir}/tim1.cal
139 <      ${lib_dir}/weave.cal ${lib_dir}/winxmit.cal ${lib_dir}/woodpat.cal
140 <      ${lib_dir}/woodtex.cal ${lib_dir}/wrinkle.cal
141 <      ${lib_dir}/page1.txt ${lib_dir}/page2.txt
142 <      ${lib_dir}/Pix.fnt
143 <      ${lib_dir}/PixOblique.fnt
144 <      ${lib_dir}/Veerdana.fnt
145 <      ${lib_dir}/VeerdanaBold.fnt
146 <      ${lib_dir}/VeerdanaBoldItalic.fnt
147 <      ${lib_dir}/VeerdanaItalic.fnt
148 <      ${lib_dir}/helvet.fnt
149 <      ${lib_dir}/hexbit4x1.fnt
150 <      ${test_dir}/model.oct
151 <      ${test_dir}/model.vp
152 <    DESTINATION lib
153 <  )
161 > install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
162 >  DESTINATION "lib"
163 > )
164  
165 <  install(FILES ${lib_dir}/Earth.hdr DESTINATION lib RENAME Earth.pic)
166 <  install(FILES ${lib_dir}/EarthBig.hdr DESTINATION lib RENAME EarthBig.pic)
157 <  install(FILES ${lib_dir}/alberta.hdr DESTINATION lib RENAME alberta.pic)
158 <  install(FILES ${lib_dir}/brick.hdr DESTINATION lib RENAME brick.pic)
159 <  install(FILES ${lib_dir}/brickweave.hdr DESTINATION lib RENAME brickweave.pic)
160 <  install(FILES ${lib_dir}/cabin.hdr DESTINATION lib RENAME cabin.pic)
161 <  install(FILES ${lib_dir}/forestfl.hdr DESTINATION lib RENAME forestfl.pic)
162 <  install(FILES ${lib_dir}/oakfloor.hdr DESTINATION lib RENAME oakfloor.pic)
163 <  install(FILES ${lib_dir}/pine.hdr DESTINATION lib RENAME pine.pic)
164 <  install(FILES ${lib_dir}/pinebark.hdr DESTINATION lib RENAME pinebark.pic)
165 <  install(FILES ${lib_dir}/podlife.hdr DESTINATION lib RENAME podlife.pic)
166 <  install(FILES ${lib_dir}/richgrove.hdr DESTINATION lib RENAME richgrove.pic)
167 <  install(FILES ${lib_dir}/shingle.hdr DESTINATION lib RENAME shingle.pic)
168 <  install(FILES ${lib_dir}/summercab.hdr DESTINATION lib RENAME summercab.pic)
169 <  install(FILES ${lib_dir}/tulips.hdr DESTINATION lib RENAME tulips.pic)
165 > # copy make tests to build
166 > file(COPY test DESTINATION ${CMAKE_BINARY_DIR})
167  
171 –  add_subdirectory(cmake_tests)
172 – endif()
173 –  
174 – install(
175 –  FILES
176 –    ${test_dir}/model.oct
177 –    ${test_dir}/model.vp
178 –  DESTINATION lib
179 – )
168  
169   include(InstallRequiredSystemLibraries)
170   add_subdirectory(InstallRules)

Diff Legend

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