Skip to content

Commit c12eaef

Browse files
committed
STYLE: Simplify SWIG CMake variables
All the binary versions are required minimum versions are now the same per-platform.
1 parent 82d8165 commit c12eaef

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

Wrapping/Generators/SwigInterface/CMakeLists.txt

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@ endif()
1111

1212
option(ITK_USE_SYSTEM_SWIG "Use system swig. If OFF, swig is built as an external project." OFF)
1313
mark_as_advanced(ITK_USE_SYSTEM_SWIG)
14+
1415
# Minimal swig version
16+
set(swig_version_min 4.2.0)
17+
# Version used in vendored binary or source build configured in this file.
18+
set(ITK_SWIG_VERSION 2024-03-26-master)
19+
1520
if(WIN32)
16-
set(swig_version_min 4.2.0)
17-
set(ITK_SWIG_VERSION 2024-03-26-master)
1821
set(swig_cmake_version 4.3.0)
1922
set(swigwin_hash
2023
"cec9eeebfec7f2a8ccf7b166a11cf8dbbc5e1eacca35563e4f0882b2b261658f394f6607243813d7083e7e2a2bbec23c5cf8b4dd92ad85838c6eb971f3833715"
2124
)
2225
set(swigwin_cid "bafybeibljxzip2irc3q3w5qlh2ae5ns27xpi7mo6iskxni45dcmwtk2x6a")
26+
27+
set(swig_ep "${CMAKE_CURRENT_BINARY_DIR}/swigwin-amd64-${ITK_SWIG_VERSION}/bin/swig.exe")
2328
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64"))
24-
set(swig_version_min 4.2.0)
25-
set(ITK_SWIG_VERSION 2024-03-26-master)
2629
set(swig_cmake_version 4.3.0)
2730
if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
2831
set(swiglinux_hash
@@ -37,9 +40,9 @@ elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" AND (CMAKE_HOST_SYSTEM_PROCESSOR S
3740
set(swiglinux_cid "bafybeihp7hk4ljxuf7duqzei2h7y7xshzyhahxaot5mapv2xevkvwuci5m")
3841
set(swiglinux_arch "amd64")
3942
endif()
43+
44+
set(swig_ep "${CMAKE_CURRENT_BINARY_DIR}/swiglinux-${swiglinux_arch}-${ITK_SWIG_VERSION}/bin/swig")
4045
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
41-
set(swig_version_min 4.2.0)
42-
set(ITK_SWIG_VERSION 2024-03-26-master)
4346
set(swig_cmake_version 4.3.0)
4447
if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
4548
set(swigmacos_hash
@@ -54,20 +57,14 @@ elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
5457
set(swigmacos_cid "bafybeifkl5wfscum7pnsjdmwhshrv5v6srilinkrftunq5g4gqzgqmyqf4")
5558
set(swigmacos_arch "amd64")
5659
endif()
60+
61+
set(swig_ep "${CMAKE_CURRENT_BINARY_DIR}/swigmacos-${swigmacos_arch}-${ITK_SWIG_VERSION}/bin/swig")
5762
else()
58-
set(ITK_SWIG_VERSION 2024-03-26-master)
59-
set(swig_version_min 4.2.0)
63+
# Build from source
64+
6065
set(swig_hash "9292f6786abed379278b8024f91b91f293f1be9764fe3c1a19023f7891c4e40587f965680ac6a595a5610cfb6650a73fd2f3932a83d5effad83f351fa70810a9")
6166
set(swig_cid "bafybeib56uexrqtccgzxjgmlammjii5ntwush4732kbkr6okbtjhzcmvia")
62-
endif()
6367

64-
if(WIN32)
65-
set(swig_ep "${CMAKE_CURRENT_BINARY_DIR}/swigwin-amd64-${ITK_SWIG_VERSION}/bin/swig.exe")
66-
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64"))
67-
set(swig_ep "${CMAKE_CURRENT_BINARY_DIR}/swiglinux-${swiglinux_arch}-${ITK_SWIG_VERSION}/bin/swig")
68-
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
69-
set(swig_ep "${CMAKE_CURRENT_BINARY_DIR}/swigmacos-${swigmacos_arch}-${ITK_SWIG_VERSION}/bin/swig")
70-
else()
7168
# follow the standard EP_PREFIX locations
7269
set(swig_binary_dir ${CMAKE_CURRENT_BINARY_DIR}/swig-prefix/src/swig-build)
7370
set(swig_source_dir ${CMAKE_CURRENT_BINARY_DIR}/swig-prefix/src/swig)

0 commit comments

Comments
 (0)