Skip to content

Commit 58f2ff0

Browse files
committed
ENH: Attempt to fix USE_SYSTEM_ITK=ON and fix small typo
1 parent d045766 commit 58f2ff0

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

ITKSoftwareGuide.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ endif()
2828
enable_testing()
2929
include(CTest)
3030

31+
if (NOT ${USE_SYSTEM_ITK})
3132
#-----------------------------------------------------------------------
3233
# Setup locations to find externally maintained test data.
3334
#-----------------------------------------------------------------------
34-
include(${PROJECT_NAME}ExternalData)
35+
include(${PROJECT_NAME}ExternalData)
3536

36-
add_subdirectory(SoftwareGuide)
37+
add_subdirectory(SoftwareGuide)
3738

38-
ExternalData_Add_Target( ${PROJECT_NAME}FetchData ) # Name of data management target
39+
ExternalData_Add_Target( ${PROJECT_NAME}FetchData ) # Name of data management target
40+
endif()

SoftwareGuide/Examples/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ find_path(ITK_EXECUTABLES_DIR
7474
"${ITK_BINARY_DIR}/../bin"
7575
"${ITK_BINARY_DIR}/../bin/Release"
7676
"${ITK_BINARY_DIR}/../bin/Debug"
77+
"${ITK_BINARY_DIR}/Wrapping/Generators/Python/itk/"
7778
"${ITK_BINARY_DIR}/../bin/RelWithDebInfo"
7879
"${ITK_BINARY_DIR}/../bin/MinSizeRel"
7980
DOC "Where the ITK examples executables are"

SoftwareGuide/Examples/RunExamples.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
def mkdir_p(path):
22-
""" Safely make a new directory, checking if it already exists"""
22+
"""Safely make a new directory, checking if it already exists"""
2323
try:
2424
os.makedirs(path)
2525
except OSError as exc: # Python >2.5
@@ -46,6 +46,7 @@ def GetInputFilesInThisLine(line):
4646
return GetFilesInThisLine(line, fileinputstag)
4747
"""
4848

49+
4950
## This class is initialized with a the starting line of
5051
## the command processing, and the block of text for
5152
## this command invocation
@@ -229,7 +230,7 @@ def ParseOneFile(sourceFile, pathFinder):
229230
# Read each line and Parse the input file
230231
#
231232
# Get the command line args from the source file
232-
sf = open(sourceFile, "r")
233+
sf = open(sourceFile, "r", encoding="ISO-8859-1")
233234
INFILE = sf.readlines()
234235
sf.close()
235236
parseLine = 0

0 commit comments

Comments
 (0)