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.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 on Mac where find_package fails
82 > #special case for manually built libtiff where find_package fails
83   if(NOT TIFF_FOUND)
84 <  unset(TIFF_INCLUDE_DIR CACHE)
83 <  find_library(TIFF_LIBRARY tiff
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)
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 <    set(TIFF_LIBRARIES ${TIFF_LIBRARY} ${Z_LIBRARY})
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  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines