ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/CMakeLists.txt
(Generate patch)

Comparing ray/src/px/CMakeLists.txt (file contents):
Revision 1.1 by greg, Sat Oct 22 22:38:10 2011 UTC vs.
Revision 1.5 by greg, Tue Aug 29 17:13:34 2017 UTC

# Line 74 | Line 74 | target_link_libraries(ra_xyze rtrad)
74   add_executable(macbethcal macbethcal.c pmapgen.c mx3.c warp3d.c)
75   target_link_libraries(macbethcal rtrad)
76  
77 < find_package(TIFF)
77 > add_executable(pmblur2 pmblur2.c)
78 > target_link_libraries(pmblur2 rtrad)
79 >
80 > add_executable(psketch psketch.c)
81 > target_link_libraries(psketch rtrad)
82 >
83 > if(NOT TIFF_LIBRARY)
84 >  find_package(TIFF)
85 > endif()
86   mark_as_advanced(CLEAR TIFF_INCLUDE_DIR TIFF_LIBRARY)
87 +
88 + #special case for manually built libtiff where find_package fails
89 + if(NOT TIFF_FOUND)
90 +  find_library(TIFF_LIBRARY NAMES libtiff.a tiff tiff3 libtiff
91 +    PATHS
92 +      ${CMAKE_CURRENT_SOURCE_DIR}/tiff/libtiff/.libs
93 +      ${radiance_BINARY_DIR}/Downloads/Source/radiance_support/src/px/tiff/libtiff/.libs
94 +      "C:/Program Files/GnuWin32/lib"
95 +      "C:/Program Files (x86)/GnuWin32/lib"
96 +  )
97 +  #if we found the library, search for tiff.h in <tiff-lib-dir>/../include
98 +  if(TIFF_LIBRARY)
99 +    get_filename_component(TIFF_LIBRARY_DIR ${TIFF_LIBRARY} PATH)
100 +    set(TIFF_INCLUDE_HINT "${TIFF_LIBRARY_DIR}/../include")
101 +    get_filename_component(TIFF_INCLUDE_HINT "${TIFF_INCLUDE_HINT}" ABSOLUTE)
102 +    find_file(TIFF_HEADER tiff.h PATHS ${TIFF_INCLUDE_HINT})
103 +    mark_as_advanced(TIFF_HEADER)
104 +    if(TIFF_HEADER)
105 +      get_filename_component(TIFF_INCLUDE_DIR "${TIFF_HEADER}" PATH)
106 +      set(TIFF_INCLUDE_DIR "${TIFF_INCLUDE_DIR}" CACHE PATH "Directory containing tiff.h" FORCE)
107 +    endif()
108 +  endif()
109 +  #if tiff.h couldn't be found, default to the version in the support tarball
110 +  if(NOT TIFF_INCLUDE_DIR)
111 +    set(TIFF_INCLUDE_DIR "${radiance_BINARY_DIR}/Downloads/Source/radiance_support/src/px/tiff/libtiff" CACHE PATH "Directory containing tiff.h" FORCE)
112 +  endif()
113 +    
114 +  find_library(Z_LIBRARY z)
115 +  if(TIFF_LIBRARY AND Z_LIBRARY)
116 +    set(TIFF_FOUND TRUE)
117 +    get_filename_component(Z_LIBRARY_RESOLVED ${Z_LIBRARY} REALPATH)
118 +    set(TIFF_LIBRARIES ${TIFF_LIBRARY} ${Z_LIBRARY_RESOLVED})
119 +  else()
120 +    #try find_package again
121 +    #it should succeed now if TIFF_LIBRARY and TIFF_INCLUDE_DIR are set
122 +    find_package(TIFF)
123 +    mark_as_advanced(CLEAR TIFF_INCLUDE_DIR TIFF_LIBRARY)
124 +  endif()
125 + endif()
126 +
127   if(TIFF_FOUND)
128    add_executable(ra_tiff ra_tiff.c)
129    target_link_libraries(ra_tiff rtrad ${TIFF_LIBRARIES})
130 <  install(TARGETS ra_tiff RUNTIME DESTINATION bin)
130 >  add_executable(normtiff normtiff.c)
131 >  target_link_libraries(normtiff rtrad ${TIFF_LIBRARIES})
132 >  install(TARGETS ra_tiff normtiff RUNTIME DESTINATION bin)
133    install(FILES ${TIFF_LIBRARIES} DESTINATION bin)
134 +  install(PROGRAMS ran2tiff.csh DESTINATION bin RENAME ran2tiff)
135   #TODO: else case
136   endif()
137  
138   install(TARGETS pfilt pflip ttyimage psign pvalue pcompos protate
139    ra_hexbit ra_bmp ra_t8 ra_t16 pcomb pinterp ra_ppm ra_rgbe ra_pict ra_ps
140 <  pextrem ra_gif ra_xyze macbethcal pcond pcwarp
140 >  pextrem ra_gif ra_xyze macbethcal pcond pcwarp psketch pmblur2
141    RUNTIME DESTINATION bin)
142  
143 < install(FILES normpat.csh falsecolor.pl pdfblur.csh pmblur.csh pmdblur.csh
144 <  xyzimage.csh pgblur.csh ra_pfm.csh pbilat.csh
145 <  DESTINATION bin)
143 > if(WIN32)
144 >  install(PROGRAMS falsecolor.pl DESTINATION bin)
145 > else()
146 >  install(PROGRAMS falsecolor.pl DESTINATION bin RENAME falsecolor)
147 >  install(PROGRAMS normpat.csh DESTINATION bin RENAME normpat)
148 >  install(PROGRAMS pdfblur.csh DESTINATION bin RENAME pdfblur)
149 >  install(PROGRAMS pmblur.csh DESTINATION bin RENAME pmblur)
150 >  install(PROGRAMS pmdblur.csh DESTINATION bin RENAME pmdblur)
151 >  install(PROGRAMS xyzimage.csh DESTINATION bin RENAME xyzimage)
152 >  install(PROGRAMS pgblur.csh DESTINATION bin RENAME pgblur)
153 >  install(PROGRAMS ra_pfm.csh DESTINATION bin RENAME ra_pfm)
154 >  install(PROGRAMS pbilat.csh DESTINATION bin RENAME pbilat)
155 >  install(PROGRAMS phisto.csh DESTINATION bin RENAME phisto)
156 > endif()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines