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

Diff Legend

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