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
Container Registry
Model registry
Operate
Environments
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
Main Repositories
otb
Commits
b643f1ca
Commit
b643f1ca
authored
11 years ago
by
Mickael Savinaud
Browse files
Options
Downloads
Patches
Plain Diff
COMP: deactivate some cmakelist option and value into otbopenjpeg to avoid conflict
parent
887ec784
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Utilities/otbopenjpeg/CMakeLists.txt
+9
-9
9 additions, 9 deletions
Utilities/otbopenjpeg/CMakeLists.txt
with
9 additions
and
9 deletions
Utilities/otbopenjpeg/CMakeLists.txt
+
9
−
9
View file @
b643f1ca
...
...
@@ -131,10 +131,10 @@ configure_file(
#-----------------------------------------------------------------------------
# OpenJPEG build configuration options.
option
(
BUILD_SHARED_LIBS
"Build OpenJPEG shared library and link executables against it."
ON
)
set
(
EXECUTABLE_OUTPUT_PATH
${
OPENJPEG_BINARY_DIR
}
/bin CACHE PATH
"Single output directory for building all executables."
)
set
(
LIBRARY_OUTPUT_PATH
${
OPENJPEG_BINARY_DIR
}
/bin CACHE PATH
"Single output directory for building all libraries."
)
mark_as_advanced
(
LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH
)
#
option(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
#
set(EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
#
set(LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
#
mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
#-----------------------------------------------------------------------------
# configure name mangling to allow multiple libraries to coexist
...
...
@@ -194,11 +194,11 @@ add_subdirectory(libopenjpeg)
#option(BUILD_MJ2 "Build the MJ2 executables." OFF)
#option(BUILD_JPIP "Build the JPIP library and executables." OFF)
if
(
BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP
)
option
(
BUILD_THIRDPARTY
"Build the thirdparty executables if it is needed"
OFF
)
add_subdirectory
(
thirdparty
)
add_subdirectory
(
applications
)
endif
()
#
if(BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP)
#
option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
#
add_subdirectory(thirdparty)
#
add_subdirectory(applications)
#
endif()
#-----------------------------------------------------------------------------
# opj_config.h generation (2/2)
...
...
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