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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines