Skip to content

Commit 31dbb6c

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

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def ParseOneFile(sourceFile, pathFinder):
229229
# Read each line and Parse the input file
230230
#
231231
# Get the command line args from the source file
232-
sf = open(sourceFile, "r")
232+
sf = open(sourceFile, 'r',encoding="ISO-8859-1")
233233
INFILE = sf.readlines()
234234
sf.close()
235235
parseLine = 0

0 commit comments

Comments
 (0)