Revision 19374 trunk/libraries/libjni-gdal/CMakeModules/FindGDAL.cmake

View differences:

FindGDAL.cmake
27 27
    /opt/include
28 28
    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
29 29
    /usr/freeware/include
30
    C:/gdal/gdal-1.5.0/gcore
30 31
    C:/gdal/gdal-1.4.4/gcore
31 32
    C:/gdal/gdal-1.4.2/gcore
32 33
    C:/gdal/gdal-1.4.1/gcore
34
    C:/gdal-1.5.0/gcore
33 35
    C:/gdal-1.4.4/gcore
34 36
    C:/gdal-1.4.2/gcore
35 37
    C:/gdal-1.4.1/gcore
36 38
)
37 39

  
38 40
FIND_PATH(GDAL_INCLUDE_DIR2 cpl_port.h
41
	C:/gdal/gdal-1.5.0/port
39 42
	C:/gdal/gdal-1.4.4/port
40 43
    C:/gdal/gdal-1.4.2/port
41 44
    C:/gdal/gdal-1.4.1/port
45
    C:/gdal-1.5.0/port
42 46
    C:/gdal-1.4.4/port
43 47
    C:/gdal-1.4.2/port
44 48
    C:/gdal-1.4.1/port
45 49
)
46 50

  
47 51
FIND_PATH(GDAL_INCLUDE_DIR3 ogr_api.h
52
	C:/gdal/gdal-1.5.0/org
48 53
	C:/gdal/gdal-1.4.4/ogr
49 54
    C:/gdal/gdal-1.4.2/ogr
50 55
    C:/gdal/gdal-1.4.1/ogr
56
    C:/gdal-1.5.0/ogr
51 57
    C:/gdal-1.4.4/ogr
52 58
    C:/gdal-1.4.2/ogr
53 59
    C:/gdal-1.4.1/ogr
54 60
)
55 61

  
56 62
FIND_PATH(GDAL_INCLUDE_DIR4 ogrsf_frmts.h
63
	C:/gdal/gdal-1.5.0/ogr/ogrsf_frmts
57 64
	C:/gdal/gdal-1.4.4/ogr/ogrsf_frmts
58 65
    C:/gdal/gdal-1.4.2/ogr/ogrsf_frmts
59 66
    C:/gdal/gdal-1.4.1/ogr/ogrsf_frmts
67
    C:/gdal-1.5.0/ogr/ogrsf_frmts
60 68
    C:/gdal-1.4.4/ogr/ogrsf_frmts
61 69
    C:/gdal-1.4.2/ogr/ogrsf_frmts
62 70
    C:/gdal-1.4.1/ogr/ogrsf_frmts
63 71
)
64 72

  
65 73
FIND_LIBRARY(GDAL_LIBRARY 
66
    NAMES gdal gdal_i gdal1.4.0 gdal1.3.2 GDAL
74
    NAMES gdal gdal1.5.0 gdal1.4.0 gdal1.3.2 gdal_i GDAL
67 75
    PATHS
68 76
    ${GDAL_DIR}/lib
69 77
    $ENV{GDAL_DIR}/lib
......
81 89
    /opt/lib
82 90
    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
83 91
    /usr/freeware/lib64
92
    C:/gdal/gdal-1.5.0
84 93
    C:/gdal/gdal-1.4.4
85 94
    C:/gdal/gdal-1.4.2
86 95
    C:/gdal/gdal-1.4.1
96
    C:/gdal-1.5.0
87 97
    C:/gdal-1.4.4
88 98
    C:/gdal-1.4.2
89 99
    C:/gdal-1.4.1
90 100
)
101
IF(HDF5)
102
	FIND_LIBRARY(HDF5_LIBRARY 
103
	    NAMES hdf5dll HDF5
104
	    PATHS
105
	    C:/gdal/gdal-1.5.0
106
	    C:/gdal/gdal-1.4.4
107
	    C:/gdal/gdal-1.4.2
108
	    C:/gdal/gdal-1.4.1
109
	    C:/gdal-1.5.0
110
	    C:/gdal-1.4.4
111
	    C:/gdal-1.4.2
112
	    C:/gdal-1.4.1
113
	)
114
ENDIF(HDF5)
91 115

  
116
IF(HDF4)
117
	FIND_LIBRARY(HDF4HMM_LIBRARY 
118
	    NAMES hm422m HDF4HMM
119
	    PATHS
120
	    C:/gdal/gdal-1.5.0
121
	    C:/gdal/gdal-1.4.4
122
	    C:/gdal/gdal-1.4.2
123
	    C:/gdal/gdal-1.4.1
124
	    C:/gdal-1.5.0
125
	    C:/gdal-1.4.4
126
	    C:/gdal-1.4.2
127
	    C:/gdal-1.4.1
128
	)
129

  
130
	FIND_LIBRARY(HDF4HDM_LIBRARY 
131
	    NAMES hd422m HDF4HDM
132
	    PATHS
133
	    C:/gdal/gdal-1.5.0
134
	    C:/gdal/gdal-1.4.4
135
	    C:/gdal/gdal-1.4.2
136
	    C:/gdal/gdal-1.4.1
137
	    C:/gdal-1.5.0
138
	    C:/gdal-1.4.4
139
	    C:/gdal-1.4.2
140
	    C:/gdal-1.4.1
141
	)
142
ENDIF(HDF4)
143

  
92 144
SET(GDAL_FOUND "NO")
93 145
IF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
94 146
    SET(GDAL_FOUND "YES")

Also available in: Unified diff