From 70637666a293111c83455de515798cd65310f161 Mon Sep 17 00:00:00 2001
From: Kasper Marstal <kaspermarstal@gmail.com>
Date: Fri, 28 Aug 2015 15:53:31 +0200
Subject: [PATCH] ELASTIX-1 Add elastix macro for ITK object factory
---
CMakeLists.txt | 5 ++---
Modules/CMakeLists.txt | 2 +-
Modules/Core/Blueprints/CMakeLists.txt | 0
Modules/Core/CMakeLists.txt | 6 ++----
Modules/Core/Common/CMakeLists.txt | 2 +-
Modules/Core/Common/include/elxMacro.h | 4 ++--
6 files changed, 8 insertions(+), 11 deletions(-)
create mode 100644 Modules/Core/Blueprints/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9251974..5f8add9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,14 +48,13 @@ add_subdirectory( Modules )
# Testing requires CMake version 2.8.11 to download test data
if( CMAKE_VERSION VERSION_LESS 2.8.11 )
set( ELASTIX_BUILD_TESTING_DEFAULT OFF )
- message( STATUS "ELASTIX_BUILD_TESTING is set to OFF by default because CMake version is less than 2.8.11" )
+ message( STATUS "ELASTIX_BUILD_TESTING is set to OFF because CMake version is less than 2.8.11" )
else()
set( ELASTIX BUILD_TESTING_DEFAULT ON )
endif()
option( ELASTIX_BUILD_TESTING "Enable building tests." ${ELASTIX_BUILD_TESTING_DEFAULT} )
-
-if( ELASTIX_BUILD_TESTING )
+if( ${ELASTIX_BUILD_TESTING} )
enable_testing()
add_subdirectory( Testing )
endif()
diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt
index ed8ac28d..3c6212d3 100644
--- a/Modules/CMakeLists.txt
+++ b/Modules/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory(
Core
-)
\ No newline at end of file
+)
diff --git a/Modules/Core/Blueprints/CMakeLists.txt b/Modules/Core/Blueprints/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/Modules/Core/CMakeLists.txt b/Modules/Core/CMakeLists.txt
index dac4f721..84c12fcb 100644
--- a/Modules/Core/CMakeLists.txt
+++ b/Modules/Core/CMakeLists.txt
@@ -1,4 +1,2 @@
-add_subdirectory(
- Common
- Blueprints
-)
\ No newline at end of file
+add_subdirectory( Common )
+add_subdirectory( Blueprints )
diff --git a/Modules/Core/Common/CMakeLists.txt b/Modules/Core/Common/CMakeLists.txt
index fc2d9b4b..b83cfce3 100644
--- a/Modules/Core/Common/CMakeLists.txt
+++ b/Modules/Core/Common/CMakeLists.txt
@@ -1 +1 @@
-include_directories( include )
\ No newline at end of file
+include_directories( include )
diff --git a/Modules/Core/Common/include/elxMacro.h b/Modules/Core/Common/include/elxMacro.h
index d176d1a5..15f63f9e 100644
--- a/Modules/Core/Common/include/elxMacro.h
+++ b/Modules/Core/Common/include/elxMacro.h
@@ -2,8 +2,8 @@
#define __elxMacro_h
/**
- * Register class with the object factory and provide
- * associated RTTI (Run-Time Type Information)
+ * Register class with the object factory and set RTTI (Run-Time Type
+ * Information)
*/
#define elxNewMacro( className, superClassName ) \
typedef className Self; \
--
GitLab