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.2 by greg, Wed Apr 25 22:21:06 2012 UTC

# Line 76 | Line 76 | target_link_libraries(macbethcal rtrad)
76  
77   find_package(TIFF)
78   mark_as_advanced(CLEAR TIFF_INCLUDE_DIR TIFF_LIBRARY)
79 +
80 + #special case for manually built libtiff on Mac where find_package fails
81 + if(NOT TIFF_FOUND)
82 +  unset(TIFF_INCLUDE_DIR CACHE)
83 +  find_library(TIFF_LIBRARY tiff
84 +    PATHS
85 +      ${CMAKE_CURRENT_SOURCE_DIR}/tiff/libtiff/.libs
86 +      ${radiance_BINARY_DIR}/Downloads/Source/radiance_support/src/px/tiff/libtiff/.libs)
87 +  find_library(Z_LIBRARY z)
88 +  if(TIFF_LIBRARY AND Z_LIBRARY)
89 +    set(TIFF_FOUND TRUE)
90 +    set(TIFF_LIBRARIES ${TIFF_LIBRARY} ${Z_LIBRARY})
91 +  endif()
92 + endif()
93 +
94   if(TIFF_FOUND)
95    add_executable(ra_tiff ra_tiff.c)
96    target_link_libraries(ra_tiff rtrad ${TIFF_LIBRARIES})
97 <  install(TARGETS ra_tiff RUNTIME DESTINATION bin)
97 >  add_executable(normtiff normtiff.c)
98 >  target_link_libraries(normtiff rtrad ${TIFF_LIBRARIES})
99 >  install(TARGETS ra_tiff normtiff RUNTIME DESTINATION bin)
100    install(FILES ${TIFF_LIBRARIES} DESTINATION bin)
101 +  install(PROGRAMS ran2tiff.csh DESTINATION bin RENAME ran2tiff)
102   #TODO: else case
103   endif()
104  
# Line 89 | Line 107 | install(TARGETS pfilt pflip ttyimage psign pvalue pcom
107    pextrem ra_gif ra_xyze macbethcal pcond pcwarp
108    RUNTIME DESTINATION bin)
109  
110 < install(FILES normpat.csh falsecolor.pl pdfblur.csh pmblur.csh pmdblur.csh
111 <  xyzimage.csh pgblur.csh ra_pfm.csh pbilat.csh
112 <  DESTINATION bin)
110 > if(WIN32)
111 >  install(PROGRAMS falsecolor.pl DESTINATION bin)
112 > else()
113 >  install(PROGRAMS falsecolor.pl DESTINATION bin RENAME falsecolor)
114 >  install(PROGRAMS normpat.csh DESTINATION bin RENAME normpat)
115 >  install(PROGRAMS pdfblur.csh DESTINATION bin RENAME pdfblur)
116 >  install(PROGRAMS pmblur.csh DESTINATION bin RENAME pmblur)
117 >  install(PROGRAMS pmdblur.csh DESTINATION bin RENAME pmdblur)
118 >  install(PROGRAMS xyzimage.csh DESTINATION bin RENAME xyzimage)
119 >  install(PROGRAMS pgblur.csh DESTINATION bin RENAME pgblur)
120 >  install(PROGRAMS ra_pfm.csh DESTINATION bin RENAME ra_pfm)
121 >  install(PROGRAMS pbilat.csh DESTINATION bin RENAME pbilat)
122 >  install(PROGRAMS phisto.csh DESTINATION bin RENAME phisto)
123 > endif()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines