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.2 by greg, Wed Apr 25 22:21:06 2012 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 on Mac where find_package fails
88 > #special case for manually built libtiff where find_package fails
89   if(NOT TIFF_FOUND)
90 <  unset(TIFF_INCLUDE_DIR CACHE)
83 <  find_library(TIFF_LIBRARY tiff
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)
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 <    set(TIFF_LIBRARIES ${TIFF_LIBRARY} ${Z_LIBRARY})
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  
# Line 104 | Line 137 | 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   if(WIN32)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines