Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Jialin Wang
otb
Commits
1d689368
Commit
1d689368
authored
Mar 11, 2016
by
Manuel Grizonnet
Browse files
Merge branch 'bugfix-1150' into release-5.2
parents
614232fe
05828464
Changes
1
Hide whitespace changes
Inline
Side-by-side
SuperBuild/CMake/External_gdal.cmake
View file @
1d689368
...
...
@@ -13,7 +13,7 @@ else()
message
(
STATUS
" Using GDAL SuperBuild version"
)
# declare dependencies
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM
(
${
proj
}
TIFF CURL GEOTIFF PNG JPEG OPENJPEG SQLITE GEOS ZLIB EXPAT
LIBKML
)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM
(
${
proj
}
TIFF CURL GEOTIFF PNG JPEG OPENJPEG SQLITE GEOS ZLIB EXPAT
)
INCLUDE_SUPERBUILD_DEPENDENCIES
(
${${
proj
}
_DEPENDENCIES
}
)
# set proj back to its original value
...
...
@@ -27,7 +27,6 @@ else()
ADD_SUPERBUILD_CONFIGURE_VAR
(
SQLITE_ROOT --with-sqlite3
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
ZLIB_ROOT --with-libz
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
EXPAT_ROOT --with-expat
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
LIBKML_ROOT --with-libkml
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
CURL_ROOT --with-curl
"/bin/curl-config"
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GEOS_ROOT --with-geos
"/bin/geos-config"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment