Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempt to fix USE_SYSTEM_ITK #153

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Attempt to fix USE_SYSTEM_ITK #153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ef2d9a
Attempt to fix USE_SYSTEM_ITK=ON and fix small typo
melrobin Apr 25, 2021
4d0ec23
Fix to push
melrobin Apr 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ITKSoftwareGuide.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include(${ITK_USE_FILE})

if( NOT IS_DIRECTORY "${ITK_SOURCE_DIR}" )
message(FATAL_ERROR "ITK source directory is not set :${ITK_SOURCE_DIR}:")
endif()
endif()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the trailing whitespace.

if( NOT IS_DIRECTORY "${ITK_BINARY_DIR}" )
message(FATAL_ERROR "ITK build directory is not set :${ITK_BINARY_DIR}:")
endif()
Expand All @@ -28,11 +28,13 @@ endif()
enable_testing()
include(CTest)

if (NOT ${USE_SYSTEM_ITK})
#-----------------------------------------------------------------------
# Setup locations to find externally maintained test data.
#-----------------------------------------------------------------------
include(${PROJECT_NAME}ExternalData)
include(${PROJECT_NAME}Data)

add_subdirectory(SoftwareGuide)
add_subdirectory(SoftwareGuide)

ExternalData_Add_Target( ${PROJECT_NAME}FetchData ) # Name of data management target
ExternalData_Add_Target( ${PROJECT_NAME}FetchData ) # Name of data management target
endif()
1 change: 1 addition & 0 deletions SoftwareGuide/Examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ find_path(ITK_EXECUTABLES_DIR
"${ITK_BINARY_DIR}/../bin"
"${ITK_BINARY_DIR}/../bin/Release"
"${ITK_BINARY_DIR}/../bin/Debug"
"${ITK_BINARY_DIR}/Wrapping/Generators/Python/itk/"
"${ITK_BINARY_DIR}/../bin/RelWithDebInfo"
"${ITK_BINARY_DIR}/../bin/MinSizeRel"
DOC "Where the ITK examples executables are"
Expand Down
2 changes: 1 addition & 1 deletion SoftwareGuide/Examples/RunExamples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def ParseOneFile(sourceFile, pathFinder):
# Read each line and Parse the input file
#
# Get the command line args from the source file
sf = open(sourceFile, 'r')
sf = open(sourceFile, 'r',encoding="ISO-8859-1")
INFILE = sf.readlines()
sf.close()
parseLine = 0
Expand Down
2 changes: 1 addition & 1 deletion TODO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Get output images only produced in BINARY_DIR.
-- Describe Modularization as part of a ITKv3->ITKv4 transition appendix
-- Update Acknowledgements
-- Test clean builds
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jhlegarreta we should clean up this TODO, as many/most things have been done by now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzenanz I agree the list needs to be cleaned up, each item be checked, and maybe issues be opened instead of keeping this file. Not sure if I will have the bandwidth in the short-, mid-term to do this though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turning the entire file into issues is a great idea! We don't have to address them soon.

-- Suport "USE_SYSTEM_ITK"
-- Support "USE_SYSTEM_ITK"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this now works, it can be removed from this to do list.


==========================================================
This is a list of potential topics to be added to the Software Guide.
Expand Down