Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
c2928dde
Commit
c2928dde
authored
Mar 17, 2015
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: superbuild: use geos-config for GDAL
parent
30b50ba8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
SuperBuild/CMake/External_gdal.cmake
SuperBuild/CMake/External_gdal.cmake
+5
-1
SuperBuild/CMake/SuperBuild_Macro.cmake
SuperBuild/CMake/SuperBuild_Macro.cmake
+4
-2
No files found.
SuperBuild/CMake/External_gdal.cmake
View file @
c2928dde
...
...
@@ -25,11 +25,15 @@ else()
ADD_SUPERBUILD_CONFIGURE_VAR
(
JPEG_SB_ROOT --with-jpeg
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
OPENJPEG_SB_ROOT --with-openjpeg
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
SQLITE_SB_ROOT --with-sqlite3
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GEOS_SB_ROOT --with-geos
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
ZLIB_SB_ROOT --with-libz
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
EXPAT_SB_ROOT --with-expat
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
LIBKML_SB_ROOT --with-libkml
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
CURL_SB_ROOT --with-curl
)
if
(
MSVC
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GEOS_SB_ROOT --with-geos
)
else
()
ADD_SUPERBUILD_CONFIGURE_VAR
(
GEOS_SB_ROOT --with-geos
"/bin/geos-config"
)
endif
()
#if(USE_SYSTEM_TIFF)
# if(NOT SYSTEM_TIFF_PREFIX STREQUAL "")
...
...
SuperBuild/CMake/SuperBuild_Macro.cmake
View file @
c2928dde
...
...
@@ -87,14 +87,16 @@ macro(ADD_SUPERBUILD_CMAKE_VAR var)
endmacro
(
ADD_SUPERBUILD_CMAKE_VAR
)
# Macro to add a configure variable to ${proj}_SB_CONFIG
# optional 3rd argument : suffix to the variable
macro
(
ADD_SUPERBUILD_CONFIGURE_VAR var name
)
set
(
suffix
"
${
ARGV2
}
"
)
if
(
DEFINED _SB_
${
var
}
)
list
(
APPEND
${
proj
}
_SB_CONFIG
${
name
}
=
${
_SB_
${
var
}}
${
name
}
=
${
_SB_
${
var
}}
${
suffix
}
)
elseif
(
DEFINED
${
var
}
)
list
(
APPEND
${
proj
}
_SB_CONFIG
${
name
}
=
${${
var
}}
${
name
}
=
${${
var
}}
${
suffix
}
)
endif
()
endmacro
(
ADD_SUPERBUILD_CONFIGURE_VAR
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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