Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Cabieces
otb
Commits
cca617db
Commit
cca617db
authored
7 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
ENH: add the OTB_WRAP_PYTHON3 option in SuperBuild
parent
ab92eac8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SuperBuild/CMake/External_otb.cmake
+8
-1
8 additions, 1 deletion
SuperBuild/CMake/External_otb.cmake
SuperBuild/CMakeLists.txt
+1
-0
1 addition, 0 deletions
SuperBuild/CMakeLists.txt
with
9 additions
and
1 deletion
SuperBuild/CMake/External_otb.cmake
+
8
−
1
View file @
cca617db
...
...
@@ -74,7 +74,7 @@ if(OTB_USE_MUPARSERX)
ADD_SUPERBUILD_CMAKE_VAR
(
OTB MUPARSERX_LIBRARY
)
endif
()
if
(
OTB_WRAP_PYTHON OR OTB_WRAP_JAVA
)
if
(
OTB_WRAP_PYTHON OR OTB_WRAP_JAVA
OR OTB_WRAP_PYTHON3
)
ADD_SUPERBUILD_CMAKE_VAR
(
OTB SWIG_EXECUTABLE
)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM
(
OTB SWIG
)
endif
()
...
...
@@ -85,6 +85,12 @@ if(OTB_WRAP_PYTHON)
ADD_SUPERBUILD_CMAKE_VAR
(
OTB PYTHON_EXECUTABLE
)
endif
()
if
(
OTB_WRAP_PYTHON3
)
ADD_SUPERBUILD_CMAKE_VAR
(
OTB PYTHON3_INCLUDE_DIR
)
ADD_SUPERBUILD_CMAKE_VAR
(
OTB PYTHON3_LIBRARY
)
ADD_SUPERBUILD_CMAKE_VAR
(
OTB PYTHON3_EXECUTABLE
)
endif
()
if
(
OTB_USE_QT4
)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM
(
OTB QT4
)
endif
()
...
...
@@ -186,6 +192,7 @@ ExternalProject_Add(OTB
-DOTB_USE_QWT:BOOL=
${
OTB_USE_QWT
}
-DOTB_USE_OPENMP:BOOL=
${
OTB_USE_OPENMP
}
-DOTB_WRAP_PYTHON:BOOL=
${
OTB_WRAP_PYTHON
}
-DOTB_WRAP_PYTHON3:BOOL=
${
OTB_WRAP_PYTHON3
}
-DOTB_WRAP_JAVA:BOOL=
${
OTB_WRAP_JAVA
}
${
OTB_ADDITIONAL_CACHE
}
CMAKE_ARGS
${
OTB_SB_CONFIG
}
...
...
This diff is collapsed.
Click to expand it.
SuperBuild/CMakeLists.txt
+
1
−
0
View file @
cca617db
...
...
@@ -333,6 +333,7 @@ find_path(OTB_DATA_ROOT README-OTB-Data
# SWIG Wrapping
option
(
OTB_WRAP_PYTHON
"Enable python wrappers for OTB applications (requires SWIG)"
ON
)
option
(
OTB_WRAP_PYTHON3
"Enable python 3 wrappers for OTB applications (requires SWIG)"
OFF
)
option
(
OTB_WRAP_JAVA
"Enable java wrappers for OTB applications (requires SWIG)"
OFF
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/CMake/CTestCustom.cmake.in
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment