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.11 by greg, Wed Apr 16 20:48:07 2014 UTC vs.
Revision 1.31 by greg, Tue Dec 5 21:47:27 2023 UTC

# Line 1 | Line 1
1 < cmake_minimum_required(VERSION 2.8.4)
2 < project("radiance")
1 > cmake_minimum_required(VERSION 3.12)
2 > cmake_policy(SET CMP0020 NEW)
3 > cmake_policy(SET CMP0048 NEW)
4 > cmake_policy(SET CMP0054 NEW)
5 > cmake_policy(SET CMP0074 NEW)
6  
7 < enable_testing()
8 < include(CTest)
7 > # project-defined modules
8 > set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/resources/cmake/modules")
9  
10 < option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
8 < option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
10 > set(SUPPORTED_LANGUAGES C CXX)
11  
12 < option(CPACK_NREL_SUPPORT "Include OpenStudio ToolFinder Help?" OFF)
13 <
14 < if( CPACK_NREL_SUPPORT )
15 <  # find git so we can query for the current git tag
16 <  find_program(git git)
17 <  if (NOT git)
18 <    message(ERROR "Please specify the path to the git executable")
12 > # Get the project version.
13 > set(VERSIONFILE "${CMAKE_CURRENT_LIST_DIR}/src/rt/VERSION")
14 > if(EXISTS ${VERSIONFILE})
15 >  file(READ  ${VERSIONFILE} NAMEVERSION)
16 >  if(${NAMEVERSION} MATCHES "^([A-Za-z]+) +([0-9]+\\.[0-9]+)")
17 >    # project name must be lower case, or the CPack module fails
18 >    string(TOLOWER ${CMAKE_MATCH_1} PROGNAME)
19 >    project(${PROGNAME} VERSION ${CMAKE_MATCH_2} LANGUAGES ${SUPPORTED_LANGUAGES})
20    endif()
21 + else()
22 +    project(radiance LANGUAGES ${SUPPORTED_LANGUAGES})
23 + endif()
24  
25 <  # call git log to get output containing the tag
20 <  execute_process(
21 <    COMMAND ${git} branch
22 <    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
23 <    OUTPUT_VARIABLE git_log_output)
25 > message("Project: " ${CMAKE_PROJECT_NAME} " " ${PROJECT_VERSION})
26  
27 <  # create & install the source version .txt file
28 <  file(WRITE "NREL_ver.txt" "Radiance built from source branch(*):\n ${git_log_output}")
29 <  install(FILES NREL_ver.txt DESTINATION bin/..)
27 > set(PROJECT_VERSION_TWEAK "Unknown" CACHE STRING "Commit Hash")
28 > find_package(Git)
29 > if(GIT_FOUND)
30 >  execute_process(COMMAND "${GIT_EXECUTABLE}" "rev-parse" "--short=10" "HEAD"
31 >    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
32 >    TIMEOUT 10
33 >    RESULT_VARIABLE RESULT
34 >    OUTPUT_VARIABLE GIT_VERSION
35 >    ERROR_QUIET
36 >    OUTPUT_STRIP_TRAILING_WHITESPACE
37 >  )
38 >  if(${RESULT} EQUAL 0 AND NOT "${GIT_VERSION}" EQUAL "${PROJECT_VERSION_TWEAK}")
39 >    set(PROJECT_VERSION_TWEAK ${GIT_VERSION} CACHE STRING "Commit Hash" FORCE)
40 >  endif()
41   endif()
42 <
42 >
43 > enable_testing()
44 > include(CTest)
45 >
46 > option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
47 > option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
48 > option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
49 > option(BUILD_LIBTIFF "Build libtiff?" OFF)
50 > option(BUILD_QT "Build Qt related stuff?" OFF)
51 >
52   if(NOT WIN32)
53    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
54 <  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/man/ DESTINATION man)
55 <  set(qt_plugin_term "PLUGIN")
54 >  install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
55 >  if(BUILD_QT)
56 >    set(qt_plugin_term "PLUGIN")
57 >  endif()
58   endif()
59  
60 < if (WIN32)
60 > if(WIN32)
61 >  set(CPACK_NSIS_INSTALL_ROOT "C:")
62    set(CPACK_NSIS_MODIFY_PATH 1)
63 <  set(qt_plugin_term "LIBRARY")
63 >  if(BUILD_QT)
64 >    set(qt_plugin_term "LIBRARY")
65 >  endif()
66  
67    # Set RAYPATH on install
68    set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
# Line 55 | Line 82 | else()
82    set(CPACK_PACKAGING_INSTALL_PREFIX "/")
83   endif()
84  
85 + set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
86 +
87   if(APPLE)
88 +  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
89    add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
90 <  include_directories(/usr/X11R6/include)
61 <  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6")
90 >  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
91   endif()
92  
93 < IF( BUILD_PACKAGE )
94 <  INCLUDE(radianceCPack.cmake )
95 < ENDIF( BUILD_PACKAGE )
93 > if(BUILD_LIBTIFF)
94 >  include(ExternalProject)
95 >  set(LIBTIFF_URL http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz)
96 >  set(LIBTIFF_MD5 54BAD211279CC93EB4FCA31BA9BFDC79)
97 >  if(WIN32)
98 >    ExternalProject_Add(libtiff
99 >      URL ${LIBTIFF_URL}
100 >      URL_MD5 ${LIBTIFF_MD5}
101 >      CMAKE_GENERATOR "NMake Makefiles"
102 >      CMAKE_ARGS
103 >        "-UHAVE_UNISTD_H"
104 >        "-DBUILD_SHARED_LIBS=OFF"
105 >        "-DCMAKE_BUILD_TYPE=Release"
106 >        "-Dzlib=OFF"
107 >        "../libtiff"
108 >      INSTALL_COMMAND ""
109 >    )
110 >    set(TIFF_LIBRARY ${CMAKE_BINARY_DIR}/libtiff-prefix/src/libtiff-build/libtiff/tiff.lib)
111 >  else()
112 >    ExternalProject_Add(libtiff
113 >      URL ${LIBTIFF_URL}
114 >      URL_MD5 ${LIBTIFF_MD5}
115 >      CMAKE_ARGS
116 >        "-DBUILD_SHARED_LIBS=OFF"
117 >        "-DCMAKE_BUILD_TYPE=Release"
118 >        "-Dzlib=OFF"
119 >        "../libtiff"
120 >      INSTALL_COMMAND ""
121 >    )
122 >    set(TIFF_LIBRARY ${CMAKE_BINARY_DIR}/libtiff-prefix/src/libtiff-build/libtiff/libtiff.a)
123 >  endif()
124 >  set(TIFF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/libtiff/src/libtiff/libtiff)
125 > endif()
126  
127 < set(CPACK_PACKAGE_VERSION_MAJOR 4)
128 < set(CPACK_PACKAGE_VERSION_MINOR 2)
70 < set(CPACK_PACKAGE_VERSION_PATCH a)
127 > set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
128 > set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
129   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
130 < SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
131 < SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
132 < SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt")
130 > set(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
131 > set(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
132 > set(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/License.txt")
133  
134 + if(APPLE)
135 +  set(CPACK_GENERATOR "PackageMaker")
136 + elseif(UNIX)
137 +  set(CPACK_GENERATOR "TGZ")
138 + endif()
139  
140   include(CPack)
141  
142   if(NOT BUILD_HEADLESS)
143 <  find_package(Qt4 COMPONENTS QtCore QtGui)
143 >  if(BUILD_QT)
144 >    find_package(Qt5Widgets)
145 >    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
146 >    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
147 >    get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
148 >  endif()
149 >  if(APPLE)
150 >    set(X11_ROOT "/opt/X11")
151 >  endif()
152    find_package(X11)
153 +  if(APPLE)
154 +     include_directories(${X11_INCLUDE_DIR})
155 +   endif()
156 +   if(APPLE AND X11_FOUND)
157 +     set(CMAKE_FIND_FRAMEWORK NEVER)
158 +     set(OpenGL_ROOT "/opt/X11")
159 +     find_package(OpenGL)
160 +     set(CMAKE_FIND_FRAMEWORK "")
161 +   else()
162 +     find_package(OpenGL)
163 +   endif()
164 +
165   endif()
166  
167 < SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
167 > set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
168  
169 + if(MSVC)
170 +  add_definitions(/MP)
171 +  # Suppress warnings about double-to-float assignments and initializations
172 +  add_compile_options(/wd"4244" /wd"4305")
173 + endif()
174   if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
175    set(_INTEL_WINDOWS 1)
176   endif()
# Line 95 | Line 183 | endif()
183  
184   add_subdirectory("src")
185  
186 < set(test_dir ${CMAKE_CURRENT_SOURCE_DIR}/test/test\ data)
99 < option(BUILD_TESTING "Download support tarball & enable testing?" ON)
186 > set(test_dir "${CMAKE_CURRENT_SOURCE_DIR}/test/test data")
187  
188 < if(BUILD_TESTING)
102 <  #download and extract radiance support files
103 <  include(ExternalProject)
104 <  set(base "${CMAKE_BINARY_DIR}/Downloads")
105 <  set_property(DIRECTORY PROPERTY EP_BASE ${base})
106 <  ExternalProject_Add(radiance_support
107 <    URL http://www.radiance-online.org/software/non-cvs/rad4R1supp.tar.gz
108 <    URL_MD5 efd82970e1d0747eede8eb64c01048f4
109 <    CONFIGURE_COMMAND ""
110 <    BUILD_COMMAND ""
111 <    INSTALL_COMMAND ""
112 <  )
188 > add_subdirectory(resources)
189  
190 <  #install support files.
191 <  set(lib_dir ${base}/Source/radiance_support/lib)
192 <  install(
117 <    FILES
118 <      ${lib_dir}/Earth.cal ${lib_dir}/He.cal ${lib_dir}/He3.cal
119 <      ${lib_dir}/adobe.cal ${lib_dir}/ball.cal ${lib_dir}/brick.cal
120 <      ${lib_dir}/brickweave.cal ${lib_dir}/carpet.cal ${lib_dir}/climit.cal
121 <      ${lib_dir}/corrug.cal ${lib_dir}/covelight.cal ${lib_dir}/cyl.cal
122 <      ${lib_dir}/dichroic.cal ${lib_dir}/dirt.cal ${lib_dir}/fisheye.cal
123 <      ${lib_dir}/fishgeom.cal ${lib_dir}/fprism.cal ${lib_dir}/globe.cal
124 <      ${lib_dir}/gloss.cal ${lib_dir}/grating.cal ${lib_dir}/jigglepic.cal
125 <      ${lib_dir}/lcp0.cal ${lib_dir}/limit.cal ${lib_dir}/marble.cal
126 <      ${lib_dir}/orange.cal ${lib_dir}/picture.cal ${lib_dir}/plink.cal
127 <      ${lib_dir}/prism.cal ${lib_dir}/retrorefl.cal ${lib_dir}/serraglaze.cal
128 <      ${lib_dir}/slate.cal ${lib_dir}/surf.cal ${lib_dir}/tim1.cal
129 <      ${lib_dir}/weave.cal ${lib_dir}/winxmit.cal ${lib_dir}/woodpat.cal
130 <      ${lib_dir}/woodtex.cal ${lib_dir}/wrinkle.cal
131 <      ${lib_dir}/page1.txt ${lib_dir}/page2.txt
132 <      ${lib_dir}/Pix.fnt
133 <      ${lib_dir}/PixOblique.fnt
134 <      ${lib_dir}/Veerdana.fnt
135 <      ${lib_dir}/VeerdanaBold.fnt
136 <      ${lib_dir}/VeerdanaBoldItalic.fnt
137 <      ${lib_dir}/VeerdanaItalic.fnt
138 <      ${lib_dir}/helvet.fnt
139 <      ${lib_dir}/hexbit4x1.fnt
140 <      ${test_dir}/model.oct
141 <      ${test_dir}/model.vp
142 <    DESTINATION lib
143 <  )
190 > install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
191 >  DESTINATION "lib"
192 > )
193  
194 <  install(FILES ${lib_dir}/Earth.hdr DESTINATION lib RENAME Earth.pic)
195 <  install(FILES ${lib_dir}/EarthBig.hdr DESTINATION lib RENAME EarthBig.pic)
147 <  install(FILES ${lib_dir}/alberta.hdr DESTINATION lib RENAME alberta.pic)
148 <  install(FILES ${lib_dir}/brick.hdr DESTINATION lib RENAME brick.pic)
149 <  install(FILES ${lib_dir}/brickweave.hdr DESTINATION lib RENAME brickweave.pic)
150 <  install(FILES ${lib_dir}/cabin.hdr DESTINATION lib RENAME cabin.pic)
151 <  install(FILES ${lib_dir}/forestfl.hdr DESTINATION lib RENAME forestfl.pic)
152 <  install(FILES ${lib_dir}/oakfloor.hdr DESTINATION lib RENAME oakfloor.pic)
153 <  install(FILES ${lib_dir}/pine.hdr DESTINATION lib RENAME pine.pic)
154 <  install(FILES ${lib_dir}/pinebark.hdr DESTINATION lib RENAME pinebark.pic)
155 <  install(FILES ${lib_dir}/podlife.hdr DESTINATION lib RENAME podlife.pic)
156 <  install(FILES ${lib_dir}/richgrove.hdr DESTINATION lib RENAME richgrove.pic)
157 <  install(FILES ${lib_dir}/shingle.hdr DESTINATION lib RENAME shingle.pic)
158 <  install(FILES ${lib_dir}/summercab.hdr DESTINATION lib RENAME summercab.pic)
159 <  install(FILES ${lib_dir}/tulips.hdr DESTINATION lib RENAME tulips.pic)
194 > # copy make tests to build
195 > file(COPY test DESTINATION ${CMAKE_BINARY_DIR})
196  
161 –  add_subdirectory(cmake_tests)
162 – endif()
163 –  
164 – install(
165 –  FILES
166 –    ${test_dir}/model.oct
167 –    ${test_dir}/model.vp
168 –  DESTINATION lib
169 – )
197  
198   include(InstallRequiredSystemLibraries)
199   add_subdirectory(InstallRules)

Diff Legend

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