148
148
 
        set (PKGCOMP ${PKG})
149
149
 
    endif ()
150
150
 
    string (TOUPPER ${PKG} PKGUP)
151
151
 
    string (TOUPPER ${PKGCOMP} PKGCOMPUP)
152
152
 
    
153
153
 
    # Determine include dir search order
154
154
 
    set (INCLUDE_HINTS)
155
155
 
    if (${PKG}_INCLUDE_HINTS)
156
156
 
        list (APPEND INCLUDE_HINTS ${${PKG}_INCLUDE_HINTS})
157
157
 
    endif ()
158
 
-
    if (${PKGCOMP}_DIR)
159
 
-
        list (APPEND INCLUDE_HINTS ${${PKGCOMP}_DIR}/include)
 
158
+
    if (${PKGCOMP}_PATH)
 
159
+
        list (APPEND INCLUDE_HINTS ${${PKGCOMP}_PATH}/include)
160
160
 
    endif ()
161
 
-
    if (${PKG}_DIR)
162
 
-
        list (APPEND INCLUDE_HINTS ${${PKG}_DIR}/include)
 
161
+
    if (${PKG}_PATH)
 
162
+
        list (APPEND INCLUDE_HINTS ${${PKG}_PATH}/include)
163
163
 
    endif ()
164
164
 
    if (DEFINED ENV{${PKGUP}})
165
165
 
        list (APPEND INCLUDE_HINTS $ENV{${PKGUP}}/include)
166
166
 
    endif ()
167
167
 
    
168
168
 
    # Search for include file
169
169
 
    find_path (${PKGCOMP}_INCLUDE_DIR
170
170
 
               NAMES ${${PKGCOMP}_INCLUDE_NAMES}
171
171
 
               HINTS ${INCLUDE_HINTS})
172
172
 
               
173
173
 
    # Unset include search variables
174
174
 
    unset (INCLUDE_HINTS)
175
175
 
    
176
176
 
    # Determine library dir search order
177
177
 
    set (LIBRARY_HINTS)
178
178
 
    if (${PKG}_LIBRARY_HINTS)
179
179
 
        list (APPEND LIBRARY_HINTS ${${PKG}_LIBRARY_HINTS})
180
180
 
    endif ()
181
 
-
    if (${PKGCOMP}_DIR)
182
 
-
        list (APPEND LIBRARY_HINTS ${${PKGCOMP}_DIR}/lib)
 
181
+
    if (${PKGCOMP}_PATH)
 
182
+
        list (APPEND LIBRARY_HINTS ${${PKGCOMP}_PATH}/lib)
183
183
 
    endif ()
184
 
-
    if (${PKG}_DIR)
185
 
-
        list (APPEND LIBRARY_HINTS ${${PKG}_DIR}/lib)
 
184
+
    if (${PKG}_PATH)
 
185
+
        list (APPEND LIBRARY_HINTS ${${PKG}_PATH}/lib)
186
186
 
    endif ()
187
187
 
    if (DEFINED ENV{${PKGUP}})
188
188
 
        list (APPEND LIBRARY_HINTS $ENV{${PKGUP}}/lib)
189
189
 
    endif ()
190
190
 
    
191
191
 
    # Search for library file
192
192
 
    find_library (${PKGCOMP}_LIBRARY
193
193
 
                  NAMES ${${PKGCOMP}_LIBRARY_NAMES}
194
194
 
                  HINTS ${LIBRARY_HINTS})
195
195
 
    if (${PKGCOMP}_LIBRARY)