← Back to branch summary

~ubuntu-branches/debian/experimental/openscenegraph/experimental

« back to all changes in this revision

Viewing changes to OpenSceneGraph/CMakeModules/FindZLIB.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Luaces
  • Date: 2011-01-29 11:36:29 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110129113629-qisrm2kdqlurc7t3
Tags: 2.9.11-1
http://bugs.debian.org/592420
* Removed bug-555869-ftbfs_with_binutils_gold.dpatch since upstream has
  already taken care of the issue.
* Removed bug-528229.dpatch since the pkgconfig files are now also split
  in upstream.
* Removed explicit dependency on GLU.
* Upstream no longer includes osgIntrospection (Closes: #592420).
* Disabled zip plugin as its implementation stores an embedded copy of
  zlib.
* Enabled Qt support. Thanks James Goppert.
* Enabled SVG and PDF plugins. Thanks James Goppert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/CMakeModules/FindZLIB.cmake
13
13
FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
14
14
    $ENV{ZLIB_DIR}/include
15
15
    $ENV{ZLIB_DIR}
16
 
    $ENV{OSGDIR}/include
17
 
    $ENV{OSGDIR}
18
 
    $ENV{OSG_ROOT}/include
19
16
    ~/Library/Frameworks
20
17
    /Library/Frameworks
21
18
    /usr/local/include
24
21
    /opt/local/include # DarwinPorts
25
22
    /opt/csw/include # Blastwave
26
23
    /opt/include
27
 
    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
28
24
    /usr/freeware/include
29
25
)
30
26
 
33
29
    PATHS
34
30
    $ENV{ZLIB_DIR}/lib
35
31
    $ENV{ZLIB_DIR}
36
 
    $ENV{OSGDIR}/lib
37
 
    $ENV{OSGDIR}
38
 
    $ENV{OSG_ROOT}/lib
39
32
    ~/Library/Frameworks
40
33
    /Library/Frameworks
41
34
    /usr/local/lib
44
37
    /opt/local/lib
45
38
    /opt/csw/lib
46
39
    /opt/lib
47
 
    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
48
40
    /usr/freeware/lib64
49
41
)
50
42