Skip to content

Commit 0eac15b

Browse files
committed
ENH: Remove support for wrapping with WRAP_EXPLICIT
The EXPLICIT generation of all symbols for C++ appears to not be working properly, and is not tested.
1 parent 88f3da1 commit 0eac15b

File tree

9 files changed

+3
-196
lines changed

9 files changed

+3
-196
lines changed

CMake/ITKConfig.cmake.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ set(ITK_USE_GPU "@ITK_USE_GPU@")
111111

112112
# Wrapping
113113
set(ITK_WRAPPING "@ITK_WRAPPING@")
114-
# ITK_WRAP_SWIGINTERFACE and ITK_WRAP_CASTXML are set
115-
# to ITK_WRAPPING value.
116-
# ITK_WRAP_DOC and ITK_WRAP_EXPLICIT are disabled by
117-
# default.
114+
# ITK_WRAP_SWIGINTERFACE and ITK_WRAP_CASTXML are set to ITK_WRAPPING value.
115+
# ITK_WRAP_DOC is disabled by default.
118116

119117
if( NOT DEFINED ITK_WRAP_PYTHON)
120118
set(ITK_WRAP_PYTHON "@ITK_WRAP_PYTHON@")

CMake/ITKModuleExternal.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,11 @@ endif()
193193
if(ITK_WRAPPING)
194194
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_PYTHON "Build Python support." ${ITK_WRAP_PYTHON}
195195
"ITK_WRAP_PYTHON" OFF)
196-
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_EXPLICIT "Build Explicit support." OFF
197-
"ITK_WRAP_EXPLICIT" OFF)
198196
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_DOC "Build Doxygen support." OFF
199197
"ITK_WRAP_DOC" OFF)
200198
set(${itk-module}_WRAP_CASTXML ${ITK_WRAPPING})
201199
set(${itk-module}_WRAP_SWIGINTERFACE ${ITK_WRAPPING})
202200
if( (${itk-module}_WRAP_PYTHON OR
203-
${itk-module}_WRAP_EXPLICIT OR
204201
${itk-module}_WRAP_DOC
205202
)
206203
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/wrapping/CMakeLists.txt"

Wrapping/Generators/CMakeLists.txt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ endmacro()
2424

2525
macro(itk_wrap_module_all_generators library_name)
2626
itk_wrap_modules_set_prefix()
27-
if(${module_prefix}_WRAP_EXPLICIT)
28-
itk_wrap_module_explicit("${library_name}")
29-
endif()
3027
if(${module_prefix}_WRAP_CASTXML)
3128
itk_wrap_module_castxml("${library_name}")
3229
endif()
@@ -44,9 +41,6 @@ endmacro()
4441

4542
macro(itk_wrap_submodule_all_generators module)
4643
itk_wrap_modules_set_prefix()
47-
if(${module_prefix}_WRAP_EXPLICIT)
48-
itk_wrap_submodule_explicit("${module}")
49-
endif()
5044
if(${module_prefix}_WRAP_CASTXML)
5145
itk_wrap_submodule_castxml("${module}")
5246
endif()
@@ -63,9 +57,6 @@ endmacro()
6357

6458
macro(itk_end_wrap_submodule_all_generators module)
6559
itk_wrap_modules_set_prefix()
66-
if(${module_prefix}_WRAP_EXPLICIT)
67-
itk_end_wrap_submodule_explicit("${module}")
68-
endif()
6960
if(${module_prefix}_WRAP_CASTXML)
7061
itk_end_wrap_submodule_castxml("${module}")
7162
endif()
@@ -105,9 +96,6 @@ endmacro()
10596

10697
macro(itk_wrap_include_all_generators inc)
10798
itk_wrap_modules_set_prefix()
108-
if(${module_prefix}_WRAP_EXPLICIT)
109-
itk_wrap_include_explicit("${inc}")
110-
endif()
11199
if(${module_prefix}_WRAP_CASTXML)
112100
itk_wrap_include_castxml("${inc}")
113101
endif()
@@ -126,9 +114,6 @@ endmacro()
126114

127115
macro(itk_wrap_one_type_all_generators wrap_method wrap_class swig_name template_params)
128116
itk_wrap_modules_set_prefix()
129-
if(${module_prefix}_WRAP_EXPLICIT)
130-
itk_wrap_one_type_explicit("${wrap_method}" "${wrap_class}" "${swig_name}" "${template_params}")
131-
endif()
132117
if(${module_prefix}_WRAP_CASTXML)
133118
itk_wrap_one_type_castxml("${wrap_method}" "${wrap_class}" "${swig_name}" "${template_params}")
134119
endif()
@@ -217,7 +202,7 @@ foreach(lang ${generators})
217202
set(WRAP_ITK_UNUSED_GENERATORS ${WRAP_ITK_UNUSED_GENERATORS} "${lang}")
218203
endif()
219204
endforeach()
220-
mark_as_advanced(${module_prefix}_WRAP_EXPLICIT ${module_prefix}_WRAP_DOC)
205+
mark_as_advanced(${module_prefix}_WRAP_DOC)
221206
set(WRAP_ITK_GENERATORS ${WRAP_ITK_GENERATORS} CACHE INTERNAL "Internal generators list.")
222207
set(WRAP_ITK_UNUSED_GENERATORS ${WRAP_ITK_UNUSED_GENERATORS} CACHE INTERNAL "Internal unused generators list.")
223208

Wrapping/Generators/Explicit/CMakeLists.txt

Lines changed: 0 additions & 137 deletions
This file was deleted.

Wrapping/Generators/Explicit/Explicit.cxx.in

Lines changed: 0 additions & 11 deletions
This file was deleted.

Wrapping/Generators/Explicit/Explicit.h.in

Lines changed: 0 additions & 13 deletions
This file was deleted.

Wrapping/Generators/Python/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,6 @@ ${DO_NOT_WAIT_FOR_THREADS_DECLS}
473473
if(${module_prefix}_WRAP_DOC)
474474
add_dependencies(${lib} ${WRAPPER_LIBRARY_NAME}Doxygen)
475475
endif()
476-
if(${module_prefix}_WRAP_EXPLICIT AND NOT ${WRAPPER_LIBRARY_NAME} STREQUAL ITKPyBase)
477-
target_link_libraries(${lib} LINK_PUBLIC ${WRAPPER_LIBRARY_NAME}Explicit)
478-
add_dependencies(${lib} ${WRAPPER_LIBRARY_NAME}Explicit)
479-
endif()
480476
set(_component_module "")
481477
if(WRAP_ITK_INSTALL_COMPONENT_PER_MODULE)
482478
if("${WRAPPER_LIBRARY_NAME}" MATCHES "^ITK(PyUtils|PyBase)$")

Wrapping/Generators/SwigInterface/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,6 @@ macro(itk_end_wrap_module_swig_interface)
337337
set(ENV{ITK_STUB_TEMPLATE_IMPORTS} "$ENV{ITK_STUB_TEMPLATE_IMPORTS}from .${module}Template import *;")
338338
set(ENV{ITK_STUB_PROXY_IMPORTS} "$ENV{ITK_STUB_PROXY_IMPORTS}from .${module}Proxy import *;")
339339
endif()
340-
341-
342-
if(${module_prefix}_WRAP_EXPLICIT)
343-
list(APPEND opts --include "${WRAPPER_LIBRARY_NAME}Explicit.h")
344-
endif()
345340
endforeach()
346341

347342
# the master idx file (mdx file)

Wrapping/TypedefMacros.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,6 @@ macro(itk_end_wrap_module)
120120
endif()
121121

122122
itk_wrap_modules_set_prefix()
123-
if(${module_prefix}_WRAP_EXPLICIT)
124-
itk_end_wrap_module_explicit()
125-
endif()
126123
if(${module_prefix}_WRAP_CASTXML)
127124
itk_end_wrap_module_castxml()
128125
endif()

0 commit comments

Comments
 (0)