Skip to content
Snippets Groups Projects
Commit b643f1ca authored by Mickael Savinaud's avatar Mickael Savinaud
Browse files

COMP: deactivate some cmakelist option and value into otbopenjpeg to avoid conflict

parent 887ec784
No related branches found
No related tags found
No related merge requests found
...@@ -131,10 +131,10 @@ configure_file( ...@@ -131,10 +131,10 @@ configure_file(
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# OpenJPEG build configuration options. # OpenJPEG build configuration options.
option(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON) #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(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.") #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) #mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# configure name mangling to allow multiple libraries to coexist # configure name mangling to allow multiple libraries to coexist
...@@ -194,11 +194,11 @@ add_subdirectory(libopenjpeg) ...@@ -194,11 +194,11 @@ add_subdirectory(libopenjpeg)
#option(BUILD_MJ2 "Build the MJ2 executables." OFF) #option(BUILD_MJ2 "Build the MJ2 executables." OFF)
#option(BUILD_JPIP "Build the JPIP library and executables." OFF) #option(BUILD_JPIP "Build the JPIP library and executables." OFF)
if(BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP) #if(BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP)
option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) # option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
add_subdirectory(thirdparty) # add_subdirectory(thirdparty)
add_subdirectory(applications) # add_subdirectory(applications)
endif() #endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# opj_config.h generation (2/2) # opj_config.h generation (2/2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment