Skip to content

Commit 71037bf

Browse files
jcfrthewtex
authored andcommitted
cmake: Refactor code introducing ITKPythonPackage module
1 parent 2455353 commit 71037bf

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

CMakeLists.txt

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,14 @@ if(ITKPythonPackage_SUPERBUILD)
5050
endif()
5151

5252
#-----------------------------------------------------------------------------
53+
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
5354
include(ExternalProject)
55+
include(ITKPythonPackage)
5456

5557
set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
5658
# ITK nightly-master 2017-06-07
5759
set(ITK_GIT_TAG "a6ec54b")
5860

59-
# Add an empty external project
60-
function(itk_ExternalProject_Add_Empty proj depends)
61-
set(depends_args)
62-
if(NOT depends STREQUAL "")
63-
set(depends_args DEPENDS ${depends})
64-
endif()
65-
ExternalProject_add(${proj}
66-
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
67-
DOWNLOAD_COMMAND ""
68-
UPDATE_COMMAND ""
69-
CONFIGURE_COMMAND ""
70-
BUILD_COMMAND ""
71-
BUILD_IN_SOURCE 1
72-
BUILD_ALWAYS 1
73-
INSTALL_COMMAND ""
74-
${depends_args}
75-
)
76-
endfunction()
77-
7861
#-----------------------------------------------------------------------------
7962
# A separate project is used to download ITK, so that it can reused
8063
# when building different "flavor" of ITK python packages
@@ -102,7 +85,7 @@ if(ITKPythonPackage_SUPERBUILD)
10285

10386
else()
10487

105-
itk_ExternalProject_Add_Empty(
88+
ipp_ExternalProject_Add_Empty(
10689
ITK-source-download
10790
""
10891
)

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include CMakeLists.txt
2+
include cmake/*.cmake
23
include README.md
34
include itkVersion.py
45
include scripts/dockcross-manylinux-build-wheels.sh

cmake/ITKPythonPackage.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
3+
# Add an empty external project
4+
function(ipp_ExternalProject_Add_Empty proj depends)
5+
set(depends_args)
6+
if(NOT depends STREQUAL "")
7+
set(depends_args DEPENDS ${depends})
8+
endif()
9+
ExternalProject_add(${proj}
10+
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
11+
DOWNLOAD_COMMAND ""
12+
UPDATE_COMMAND ""
13+
CONFIGURE_COMMAND ""
14+
BUILD_COMMAND ""
15+
BUILD_IN_SOURCE 1
16+
BUILD_ALWAYS 1
17+
INSTALL_COMMAND ""
18+
${depends_args}
19+
)
20+
endfunction()

0 commit comments

Comments
 (0)