Skip to content
Snippets Groups Projects
Commit be4693ae authored by Manuel Grizonnet's avatar Manuel Grizonnet
Browse files

ENH: cmake_build_type is now transfered by cmake_cache_args

parent d21e34b1
No related branches found
No related tags found
No related merge requests found
......@@ -122,7 +122,6 @@ endif()
# forward compilation flags
set(ITK_SB_COMPILATION_FLAGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
......
......@@ -16,17 +16,6 @@ if(MSVC)
#TODO: add LCMS dependency
endif()
# forward compilation flags
set(OPENJPEG_SB_COMPILATION_FLAGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
-DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS}
-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
-DCMAKE_STATIC_LINKER_FLAGS:STRING=${CMAKE_STATIC_LINKER_FLAGS}
)
ExternalProject_Add(OPENJPEG
PREFIX OPENJPEG
GIT_REPOSITORY "https://github.com/uclouvain/openjpeg.git"
......@@ -36,7 +25,6 @@ ExternalProject_Add(OPENJPEG
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS
${SB_CMAKE_CACHE_ARGS}
${OPENJPEG_SB_COMPILATION_FLAGS}
-DBUILD_CODEC:BOOL=ON
-DBUILD_DOC:BOOL=OFF
-DBUILD_JPIP:BOOL=OFF
......@@ -56,4 +44,4 @@ SUPERBUILD_UPDATE_CMAKE_VARIABLES(OPENJPEG FALSE)
#There is an issue with CLRF and patch from github
if(NOT MSVC)
SUPERBUILD_PATCH_SOURCE(OPENJPEG)
endif()
\ No newline at end of file
endif()
......@@ -109,8 +109,8 @@ endif()
# forward compilation flags
set(OTB_SB_C_FLAGS "${SB_PRIOR_INCLUDE_FLAGS} ${CMAKE_C_FLAGS}")
set(OTB_SB_CXX_FLAGS "${SB_PRIOR_INCLUDE_FLAGS} ${CMAKE_CXX_FLAGS}")
set(OTB_SB_COMPILATION_FLAGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_C_FLAGS:STRING=${OTB_SB_C_FLAGS}
-DCMAKE_CXX_FLAGS:STRING=${OTB_SB_CXX_FLAGS}
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
......
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