Changeset 1394

Show
Ignore:
Timestamp:
06/20/08 06:32:55 (2 months ago)
Author:
rexbron
Message:

Build oil plugins on linux.

Location:
trunk
Files:
9 added
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-id:v3-trunk0

      •  

        old new  
        15151389 andrew@aehunter.net-20080619134857-7k2kawpsxgqb9ss6 
        16161390 andrew@aehunter.net-20080619141046-tgdq69hsumw4x55z 
         171391 andrew@aehunter.net-20080620113224-d5thhgo782mw0rjo 
    • Property bzr:file-ids

      •  

        old new  
         1src/openimagelib/plugins/bmp/CMakeLists.txt     cmakelists.txt-20080620054117-eojq7cb6mkwmdhrt-1 
         2src/openimagelib/plugins/dds/CMakeLists.txt     cmakelists.txt-20080620054316-rh0ne5gsqn1wu7x7-1 
         3src/openimagelib/plugins/dpx/CMakeLists.txt     cmakelists.txt-20080620053537-iis5yie2yksbjc7s-1 
         4src/openimagelib/plugins/exr/CMakeLists.txt     cmakelists.txt-20080620063034-pwotrghy7ty4d9he-1 
         5src/openimagelib/plugins/hdr/CMakeLists.txt     cmakelists.txt-20080620063336-38shdw7234ewciiz-1 
         6src/openimagelib/plugins/png/CMakeLists.txt     cmakelists.txt-20080620064009-bafahiyohvou2xsb-1 
         7src/openimagelib/plugins/psd/CMakeLists.txt     cmakelists.txt-20080620064324-vbvaeoaxtm8km7eg-1 
         8src/openimagelib/plugins/sgi/CMakeLists.txt     cmakelists.txt-20080620064519-tohfk8jnqisxmg2u-1 
         9src/openimagelib/plugins/tga/CMakeLists.txt     cmakelists.txt-20080620064801-7n6khilt26k2aif8-1 
    • Property bzr:ancestry:v3-trunk0

      •  

        old new  
        1515andrew@aehunter.net-20080619134821-m149jig6bmpq41hx 
        1616andrew@aehunter.net-20080619141005-75220r6w2cvqbj8f 
         17andrew@aehunter.net-20080620064802-8b2g4wfk32dn8mmz 
    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-06-19 15:10:46.039000034 +0100 
         1timestamp: 2008-06-20 12:32:24.180000067 +0100 
        22committer: Andrew Hunter <andrew@aehunter.net> 
        33properties:  

  • trunk/FindOpenEXR.cmake

    r1381 r1394  
    1111 
    1212 
    13 if ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES ) 
     13if ( OpenEXR_INCLUDE_DIR AND OpenEXR_LIBRARIES ) 
    1414   # in cache already 
    1515   SET(OpenEXR_FIND_QUIETLY TRUE) 
    16 endif ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES ) 
     16endif ( OpenEXR_INCLUDE_DIR AND OpenEXR_LIBRARIES ) 
    1717 
    1818# use pkg-config to get the directories and then use these values 
    1919# in the FIND_PATH() and FIND_LIBRARY() calls 
    2020if( NOT WIN32 ) 
    21   INCLUDE(UsePkgConfig) 
     21  INCLUDE(FindPkgConfig) 
    2222 
    23   PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) 
     23  pkg_check_modules(OpenEXR OpenEXR ) 
     24  pkg_check_modules(IlmBase IlmBase) 
    2425 
    25   SET(OPENEXR_DEFINITIONS ${_OpenEXRCflags}) 
     26  find_library ( OpenEXR_LIBRARIES NAMES IlmImf ) 
     27  find_library ( Iex_LIBRARIES NAMES Iex ) 
     28  find_library ( Half_LIBRARIES NAMES Half ) 
     29  find_library ( Imath_LIBRARIES NAMES Imath ) 
     30  find_library ( IlmThread_LIBRARIES NAMES IlmThread ) 
     31 
     32  set ( IlmBase_LIBRARIES ${Iex_LIBRARIES} ${Half_LIBRARUES} ${Imath_LIBRARIES} ${IlmThread_LIBRARIES} ) 
     33 
     34  set ( OpenEXR_INCLUDE_DIR ${OpenEXR_INCLUDE_DIR} ${IlmBase_INCLUDE_DIR} ) 
     35  set ( OpenEXR_LIBRARIES ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) 
     36 
    2637endif( NOT WIN32 ) 
    2738 
    28 FIND_PATH(OPENEXR_INCLUDE_DIR NAMES OpenEXRConfig.h 
    29   PATHS 
    30   ${_OpenEXRIncDir} 
    31   PATH_SUFFIXES OpenEXR 
    32 ) 
     39#FIND_PATH(OPENEXR_INCLUDE_DIR NAMES OpenEXRConfig.h 
     40#  PATHS 
     41#  ${_OpenEXRIncDir} 
     42#  PATH_SUFFIXES OpenEXR 
     43#) 
    3344 
    34 FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmIlf 
    35   PATHS 
    36   ${_OpenEXRLinkDir} 
    37 ) 
     45#FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmIlf 
     46#  PATHS 
     47#  ${_OpenEXRLinkDir} 
     48#) 
    3849 
    3950include(FindPackageHandleStandardArgs) 
    40 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES ) 
     51FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG OpenEXR_INCLUDE_DIR OpenEXR_LIBRARIES ) 
    4152 
    4253# show the OPENEXR_INCLUDE_DIR and OPENEXR_LIBRARIES variables only in the advanced view 
    43 MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES ) 
     54MARK_AS_ADVANCED(OpenEXR_INCLUDE_DIR OpenEXR_LIBRARIES ) 
    4455