Skip to content

Commit 5ef2d9a

Browse files
committed
Attempt to fix USE_SYSTEM_ITK=ON and fix small typo
1 parent b55bf0f commit 5ef2d9a

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

ITKSoftwareGuide.cmake

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include(${ITK_USE_FILE})
1919

2020
if( NOT IS_DIRECTORY "${ITK_SOURCE_DIR}" )
2121
message(FATAL_ERROR "ITK source directory is not set :${ITK_SOURCE_DIR}:")
22-
endif()
22+
endif()
2323
if( NOT IS_DIRECTORY "${ITK_BINARY_DIR}" )
2424
message(FATAL_ERROR "ITK build directory is not set :${ITK_BINARY_DIR}:")
2525
endif()
@@ -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}Data)
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
@@ -213,7 +213,7 @@ def ParseOneFile(sourceFile, pathFinder):
213213
# Read each line and Parse the input file
214214
#
215215
# Get the command line args from the source file
216-
sf = open(sourceFile, 'r')
216+
sf = open(sourceFile, 'r',encoding="ISO-8859-1")
217217
INFILE = sf.readlines()
218218
sf.close()
219219
parseLine = 0

TODO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Get output images only produced in BINARY_DIR.
1212
-- Describe Modularization as part of a ITKv3->ITKv4 transition appendix
1313
-- Update Acknowledgements
1414
-- Test clean builds
15-
-- Suport "USE_SYSTEM_ITK"
15+
-- Support "USE_SYSTEM_ITK"
1616

1717
==========================================================
1818
This is a list of potential topics to be added to the Software Guide.

0 commit comments

Comments
 (0)