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.1 by greg, Sat Oct 22 22:38:10 2011 UTC vs.
Revision 1.20 by greg, Wed Jun 20 03:04:44 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)
35 >  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
36 >  install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man)
37 >  set(qt_plugin_term "PLUGIN")
38   endif()
39 < set(CPACK_PACKAGING_INSTALL_PREFIX "/")
40 < set(CPACK_PACKAGE_VERSION_MAJOR 0)
41 < set(CPACK_PACKAGE_VERSION_MINOR 1)
42 < set(CPACK_PACKAGE_VERSION_PATCH 3)
43 < set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
44 < SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/welcome.txt")
45 < SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/readme.txt")
46 < SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR}/license.txt")
39 >
40 > if(WIN32)
41 >  set(CPACK_NSIS_MODIFY_PATH 1)
42 >  set(qt_plugin_term "LIBRARY")
43 >
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 >  # 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)
56 >  set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/radiance")
57 >  add_definitions(-Dlinux -D_FILE_OFFSET_BITS=64 -DNOSTEREO)
58 > 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.7")
69 > endif()
70 >
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 ${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")
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 < find_package(Qt4 COMPONENTS QtCore QtGui)
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 >  if(APPLE)
127 >     include_directories(${X11_INCLUDE_DIR})
128 >  endif()
129 > endif()
130  
131 < SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
131 > set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
132  
133 + if(MSVC)
134 +  add_definitions(/MP)
135 + endif()
136   if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
137    set(_INTEL_WINDOWS 1)
138   endif()
# Line 35 | Line 145 | endif()
145  
146   add_subdirectory("src")
147  
148 < #download and extract radiance support files
39 < include(ExternalProject)
40 < set(base "${CMAKE_BINARY_DIR}/Downloads")
41 < set_property(DIRECTORY PROPERTY EP_BASE ${base})
42 < ExternalProject_Add(radiance_support
43 <  URL http://www.radiance-online.org/software/non-cvs/rad4R0supp.tar.gz
44 <  URL_MD5 123e3e40af59c8b246e1fdbf0661e877
45 <  CONFIGURE_COMMAND ""
46 <  BUILD_COMMAND ""
47 <  INSTALL_COMMAND ""
48 < )
148 > set(test_dir "${CMAKE_CURRENT_SOURCE_DIR}/test/test data")
149  
150 < #install support files.
51 < set(lib_dir ${base}/Source/radiance_support/lib)
52 < set(test_dir ${CMAKE_CURRENT_SOURCE_DIR}/test/test\ data)
53 < install(
54 <  FILES
55 <    ${lib_dir}/Earth.cal ${lib_dir}/He.cal ${lib_dir}/He3.cal
56 <    ${lib_dir}/adobe.cal ${lib_dir}/ball.cal ${lib_dir}/brick.cal
57 <    ${lib_dir}/brickweave.cal ${lib_dir}/carpet.cal ${lib_dir}/climit.cal
58 <    ${lib_dir}/corrug.cal ${lib_dir}/covelight.cal ${lib_dir}/cyl.cal
59 <    ${lib_dir}/dichroic.cal ${lib_dir}/dirt.cal ${lib_dir}/fisheye.cal
60 <    ${lib_dir}/fishgeom.cal ${lib_dir}/fprism.cal ${lib_dir}/globe.cal
61 <    ${lib_dir}/gloss.cal ${lib_dir}/grating.cal ${lib_dir}/jigglepic.cal
62 <    ${lib_dir}/lcp0.cal ${lib_dir}/limit.cal ${lib_dir}/marble.cal
63 <    ${lib_dir}/orange.cal ${lib_dir}/picture.cal ${lib_dir}/plink.cal
64 <    ${lib_dir}/prism.cal ${lib_dir}/retrorefl.cal ${lib_dir}/serraglaze.cal
65 <    ${lib_dir}/slate.cal ${lib_dir}/surf.cal ${lib_dir}/tim1.cal
66 <    ${lib_dir}/weave.cal ${lib_dir}/winxmit.cal ${lib_dir}/woodpat.cal
67 <    ${lib_dir}/woodtex.cal ${lib_dir}/wrinkle.cal
68 <    ${lib_dir}/page1.txt ${lib_dir}/page2.txt
69 <    ${lib_dir}/Pix.fnt
70 <    ${lib_dir}/PixOblique.fnt
71 <    ${lib_dir}/Veerdana.fnt
72 <    ${lib_dir}/VeerdanaBold.fnt
73 <    ${lib_dir}/VeerdanaBoldItalic.fnt
74 <    ${lib_dir}/VeerdanaItalic.fnt
75 <    ${lib_dir}/helvet.fnt
76 <    ${lib_dir}/hexbit4x1.fnt
77 <    ${test_dir}/model.oct
78 <    ${test_dir}/model.vp
79 <  DESTINATION bin
80 < )
150 > add_subdirectory(resources)
151  
152 < install(FILES ${lib_dir}/Earth.hdr DESTINATION bin RENAME Earth.pic)
153 < install(FILES ${lib_dir}/EarthBig.hdr DESTINATION bin RENAME EarthBig.pic)
154 < install(FILES ${lib_dir}/alberta.hdr DESTINATION bin RENAME alberta.pic)
85 < install(FILES ${lib_dir}/brick.hdr DESTINATION bin RENAME brick.pic)
86 < install(FILES ${lib_dir}/brickweave.hdr DESTINATION bin RENAME brickweave.pic)
87 < install(FILES ${lib_dir}/cabin.hdr DESTINATION bin RENAME cabin.pic)
88 < install(FILES ${lib_dir}/forestfl.hdr DESTINATION bin RENAME forestfl.pic)
89 < install(FILES ${lib_dir}/oakfloor.hdr DESTINATION bin RENAME oakfloor.pic)
90 < install(FILES ${lib_dir}/pine.hdr DESTINATION bin RENAME pine.pic)
91 < install(FILES ${lib_dir}/pinebark.hdr DESTINATION bin RENAME pinebark.pic)
92 < install(FILES ${lib_dir}/podlife.hdr DESTINATION bin RENAME podlife.pic)
93 < install(FILES ${lib_dir}/richgrove.hdr DESTINATION bin RENAME richgrove.pic)
94 < install(FILES ${lib_dir}/shingle.hdr DESTINATION bin RENAME shingle.pic)
95 < install(FILES ${lib_dir}/summercab.hdr DESTINATION bin RENAME summercab.pic)
96 < install(FILES ${lib_dir}/tulips.hdr DESTINATION bin RENAME tulips.pic)
97 <
98 < add_subdirectory(cmake_tests)
152 > install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
153 >  DESTINATION "lib"
154 > )
155  
156   include(InstallRequiredSystemLibraries)
157   add_subdirectory(InstallRules)

Diff Legend

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