From 3d57b193615b817b1a3347a2703ae0b85d21ddff Mon Sep 17 00:00:00 2001 From: Elvis DOHMATOB Date: Wed, 12 Nov 2014 14:57:23 +0100 Subject: [PATCH 1/3] - ENH: improved CMakeLists.txt to poll ITK REVIEW header files + useful error messages upon failure - DOC: Concise installation instructions in Readme --- CMakeLists.txt | 11 +++++++++++ README.md | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb6b589..f55dff6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,6 +119,17 @@ endif(CMAKE_COMPILER_IS_GNUCXX) include_directories(Code) add_subdirectory(Code) +#----------------------------------------------------------------------------- +#We need ITK REVIEW headers +if(NOT ITK_SOURCE_DIR) + message(SEND_ERROR "ITK_SOURCE_DIR not set! Please rerun cmake" + " or ccmake with option -D=") +endif(NOT ITK_SOURCE_DIR) +set(ITK_REVIEW_INCLUDE_DIR "${ITK_SOURCE_DIR}/Modules/Nonunit/Review/include") +if(NOT EXISTS ${ITK_REVIEW_INCLUDE_DIR}) + message(SEND_ERROR "Directory ${ITK_REVIEW_INCLUDE_DIR} does not exist! Can't fetch ITK REVIEW header files.") +endif(NOT EXISTS ${ITK_REVIEW_INCLUDE_DIR}) +include_directories("${ITK_SOURCE_DIR}/Modules/Nonunit/Review/include") #----------------------------------------------------------------------------- #Build the matlab bindings if we have some diff --git a/README.md b/README.md index 6d9aebd..d4c863f 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,7 @@ http://www.insight-journal.org/browse/publication/644 The intent of this work is to upgrade to code base to be compatible with ITKv4. +Installation +============ + $ ccmake . -DITK_DIR=../InsightToolkit-4.6.1/build/ -DITK_SOURCE_DIR=../InsightToolkit-4.6.1 + $ make From b98857891d126c8a687ca19306bb392a43b015a7 Mon Sep 17 00:00:00 2001 From: Elvis DOHMATOB Date: Wed, 12 Nov 2014 17:00:56 +0100 Subject: [PATCH 2/3] - ENH: improved CMakeLists.txt to poll ITK REVIEW header files + useful error messages upon failure - DOC: Concise installation instructions in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4c863f..5b05a09 100644 --- a/README.md +++ b/README.md @@ -10,5 +10,5 @@ The intent of this work is to upgrade to code base to be compatible with ITKv4. Installation ============ - $ ccmake . -DITK_DIR=../InsightToolkit-4.6.1/build/ -DITK_SOURCE_DIR=../InsightToolkit-4.6.1 + $ ccmake . -DITK_DIR= -DITK_SOURCE_DIR= $ make From 429bc0e0c1c09ec07e700c181a3f75c6f6e47417 Mon Sep 17 00:00:00 2001 From: Elvis DOHMATOB Date: Fri, 14 Nov 2014 05:40:33 +0100 Subject: [PATCH 3/3] misc cosmetics --- CMakeLists.txt | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f55dff6..d67e2ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,7 @@ add_subdirectory(Code) #We need ITK REVIEW headers if(NOT ITK_SOURCE_DIR) message(SEND_ERROR "ITK_SOURCE_DIR not set! Please rerun cmake" - " or ccmake with option -D=") + " or ccmake with option -D=") endif(NOT ITK_SOURCE_DIR) set(ITK_REVIEW_INCLUDE_DIR "${ITK_SOURCE_DIR}/Modules/Nonunit/Review/include") if(NOT EXISTS ${ITK_REVIEW_INCLUDE_DIR}) diff --git a/README.md b/README.md index 5b05a09..11ad5ed 100644 --- a/README.md +++ b/README.md @@ -10,5 +10,5 @@ The intent of this work is to upgrade to code base to be compatible with ITKv4. Installation ============ - $ ccmake . -DITK_DIR= -DITK_SOURCE_DIR= + $ ccmake . -DITK_DIR= -DITK_SOURCE_DIR= $ make