@@ -17,6 +17,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1717 "MinSizeRel" "RelWithDebInfo" )
1818endif ()
1919
20+ if (NOT DEFINED SimpleITK_SOURCE_DIR )
21+ set (SimpleITK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR} /SimpleITK" )
22+ endif ()
23+
2024if (SimpleITKPythonPackage_SUPERBUILD)
2125
2226 set (ep_common_cmake_cache_args)
@@ -56,9 +60,6 @@ if(SimpleITKPythonPackage_SUPERBUILD)
5660 #-----------------------------------------------------------------------------
5761 include (ExternalProject )
5862
59- set (SimpleITK_REPOSITORY https://itk.org/SimpleITK.git)
60- set (SimpleITK_GIT_TAG "v1.0rc2" )
61-
6263 # Add an empty external project
6364 function (sitk_ExternalProject_Add_Empty proj depends )
6465 set (depends_args)
@@ -84,34 +85,9 @@ if(SimpleITKPythonPackage_SUPERBUILD)
8485 # subdirectory can be use for SimpleITK's SuperBuild to build the
8586 # required Lua, GTest etc.
8687
87- message (STATUS "SuperBuild - SimpleITK-download" )
88-
8988 # Sanity checks
9089 if (DEFINED SimpleITK_SOURCE_DIR AND NOT EXISTS ${SimpleITK_SOURCE_DIR} )
91- message (FATAL_ERROR "SimpleITK_SOURCE_DIR variable is defined but corresponds to nonexistent directory" )
92- endif ()
93-
94- if (NOT DEFINED SimpleITK_SOURCE_DIR )
95-
96- set (SimpleITK_SOURCE_DIR ${CMAKE_BINARY_DIR} /SimpleITK)
97-
98- ExternalProject_add (SimpleITK-download
99- SOURCE_DIR ${SimpleITK_SOURCE_DIR}
100- GIT_REPOSITORY ${SimpleITK_REPOSITORY}
101- GIT_TAG ${SimpleITK_GIT_TAG}
102- USES_TERMINAL_DOWNLOAD 1
103- CONFIGURE_COMMAND ""
104- BUILD_COMMAND ""
105- INSTALL_COMMAND ""
106- )
107-
108- else ()
109-
110- sitk_ExternalProject_Add_Empty (
111- SimpleITK-download
112- ""
113- )
114-
90+ message (FATAL_ERROR "SimpleITK_SOURCE_DIR variable is defined but corresponds to nonexistent directory: \" ${SimpleITK_SOURCE_DIR} \" " )
11591 endif ()
11692
11793 message (STATUS "SuperBuild - SimpleITK_SOURCE_DIR: ${SimpleITK_SOURCE_DIR} " )
@@ -121,7 +97,7 @@ if(SimpleITKPythonPackage_SUPERBUILD)
12197 # that build all the tools needed (GTest, PCRE, Swig, Lua & GTest) and
12298 # then SimpleITK "core" libraries.
12399
124- message (STATUS "SuperBuild - SimpleITK-superbuild => Requires SimpleITK-download " )
100+ message (STATUS "SuperBuild - SimpleITK-superbuild" )
125101
126102 # Sanity checks
127103 if (DEFINED SimpleITK_DIR AND NOT EXISTS ${SimpleITK_DIR} )
@@ -149,16 +125,13 @@ if(SimpleITKPythonPackage_SUPERBUILD)
149125 -DSimpleITK_INSTALL_DOC_DIR:STRING=SimpleITK
150126 -DSimpleITK_BUILD_STRIP:BOOL=ON
151127 -DSimpleITK_BUILD_DISTRIBUTE:BOOL=ON
152- -DSITK_GIT_PROTOCOL :STRING=git
128+ -DSimpleITK_GIT_PROTOCOL :STRING=git
153129 -DSKBUILD:BOOL=${SKBUILD}
154130 USES_TERMINAL_CONFIGURE 1
155131 USES_TERMINAL_BUILD 1
156132 INSTALL_COMMAND ""
157- DEPENDS SimpleITK-download
158133 )
159134
160- ExternalProject_Add_StepDependencies (SimpleITK-superbuild download SimpleITK-download)
161-
162135 set (SimpleITK_DIR ${SimpleITK_SUPERBUILD_DIR} /SimpleITK-build)
163136 if (WIN32 )
164137 set (SWIG_EXECUTABLE ${SimpleITK_SUPERBUILD_DIR} /swigwin/swig.exe)
@@ -169,7 +142,6 @@ if(SimpleITKPythonPackage_SUPERBUILD)
169142
170143 sitk_ExternalProject_Add_Empty (
171144 SimpleITK-superbuild
172- SimpleITK-download
173145 )
174146
175147 endif ()
@@ -189,6 +161,11 @@ if(SimpleITKPythonPackage_SUPERBUILD)
189161
190162 message (STATUS "SuperBuild - Searching for python" )
191163
164+ if (PYTHON_VERSION_STRING)
165+ # need to do something with the passed variable to silence unused
166+ # CMake warning.
167+ endif ()
168+
192169 # Sanity checks
193170 if (DEFINED PYTHON_INCLUDE_DIR AND NOT EXISTS ${PYTHON_INCLUDE_DIR} )
194171 message (FATAL_ERROR "PYTHON_INCLUDE_DIR variable is defined but corresponds to nonexistent directory" )
@@ -245,8 +222,6 @@ if(SimpleITKPythonPackage_SUPERBUILD)
245222
246223 message (STATUS "SuperBuild - SimpleITK_PYTHON_DIR: ${SimpleITK_PYTHON_DIR} " )
247224
248- ExternalProject_Add_StepDependencies (SimpleITK-python download SimpleITK-download)
249-
250225
251226 #-----------------------------------------------------------------------------
252227 # SimpleITKPythonPackage: This project adds install rules for the "Runtime" component
0 commit comments