Commit b27a433e authored by Floris Berendsen's avatar Floris Berendsen
Browse files

ENH: renamed Cmake variables to SUPERELASTIX*

parent 0ccb6944
......@@ -4,6 +4,6 @@ list( APPEND RequiredITKModules
foreach( ITKModule ${RequiredITKModules} )
if( NOT ${ITKModule}_LOADED )
message( FATAL_ERROR "Elastix requires that ITK is build with ${ITKModule}. Please rebuild ITK with Module_${ITKModule} set to ON." )
message( FATAL_ERROR "elastix requires that ITK is build with ${ITKModule}. Please rebuild ITK with Module_${ITKModule} set to ON." )
endif()
endforeach()
......@@ -31,4 +31,4 @@ set( ${MODULE}_SOURCE_FILES
add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" ${${MODULE}_HEADER_FILES})
target_link_libraries( ${MODULE} ${ELASTIX_LIBRARIES} )
target_link_libraries( ${MODULE} ${SUPERELASTIX_LIBRARIES} )
......@@ -6,7 +6,7 @@ namespace Example3rdParty
{
// test case: there are two (slightly) incompatible codebases (i.e. 3rd party and 4th party!), each with an optimizer object and a metric object.
// goal: make elastix components of all objects and define a handshake that checks if connections can be made.
// goal: make SuperEelastix components from all objects and define a handshake that checks if connections can be made.
/*************** below: example implementations of 3rd and 4th party code base (assume we cannot change that) *********************/
......
......@@ -7,7 +7,7 @@ namespace Example4thParty
{
// test case: there are two (slightly) incompatible codebases (i.e. 3rd party and 4th party!), each with an optimizer object and a metric object.
// goal: make elastix components of all objects and define a handshake that checks if connections can be made.
// goal: make SuperEelastix components from all objects and define a handshake that checks if connections can be made.
/*************** below: example implementations of 3rd and 4th party code base (assume we cannot change that) *********************/
......
......@@ -27,4 +27,4 @@ set( ${MODULE}_SOURCE_FILES
add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" ${${MODULE}_HEADER_FILES})
target_link_libraries( ${MODULE} ${ELASTIX_LIBRARIES} )
target_link_libraries( ${MODULE} ${SUPERELASTIX_LIBRARIES} )
......@@ -32,5 +32,5 @@ set( ${MODULE}_SOURCE_FILES
add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" ${${MODULE}_HEADER_FILES})
target_link_libraries( ${MODULE} ${ELASTIX_LIBRARIES} )
target_link_libraries( ${MODULE} ${SUPERELASTIX_LIBRARIES} )
......@@ -28,4 +28,4 @@ set( ${MODULE}_SOURCE_FILES
add_library( ${MODULE} STATIC ${${MODULE}_SOURCE_FILES} ${${MODULE}_HEADER_FILES})
target_link_libraries( ${MODULE} ${ELASTIX_LIBRARIES} )
target_link_libraries( ${MODULE} ${SUPERELASTIX_LIBRARIES} )
......@@ -35,4 +35,4 @@ set( ${MODULE}_SOURCE_FILES
# Compile library
add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" ${${MODULE}_HEADER_FILES} )
target_link_libraries( ${MODULE} ${ELASTIX_LIBRARIES} )
target_link_libraries( ${MODULE} ${SUPERELASTIX_LIBRARIES} )
......@@ -16,7 +16,7 @@ set( CMAKE_MODULE_PATH
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "SuperBuild install directory" FORCE)
# ---------------------------------------------------------------------
# Elastix SuperBuild configuration
# SuperElastix SuperBuild configuration
# Build release by default
if( NOT DEFINED CMAKE_BUILD_TYPE )
......@@ -24,7 +24,7 @@ if( NOT DEFINED CMAKE_BUILD_TYPE )
endif()
# Build examples by default
# Examples will be build as an external project to verify the installation of elastix
# Examples will be build as an external project to verify the installation of SuperElastix
option( SUPERELASTIX_BUILD_EXAMPLES "Enable building examples." ON )
# Build tests by default
......
......@@ -33,4 +33,4 @@ ExternalProject_Add( BOOST
set( BOOST_ROOT "${CMAKE_INSTALL_PREFIX}/${proj}-prefix/src/BOOST" )
list( APPEND ELASTIX_DEPENDENCIES ${proj} )
list( APPEND SUPERELASTIX_DEPENDENCIES ${proj} )
......@@ -101,4 +101,4 @@ ExternalProject_Add( ${proj}
ExternalProject_Get_Property( Elastix binary_dir )
set( ELASTIX_USE_FILE "${binary_dir}/src/UseElastix.cmake" )
list( APPEND ELASTIX_DEPENDENCIES ${proj} )
list( APPEND SUPERELASTIX_DEPENDENCIES ${proj} )
......@@ -22,4 +22,4 @@ ExternalProject_Add( ${proj}
ExternalProject_Get_Property( ${proj} install_dir )
set( ITK_DIR "${install_dir}/lib/cmake/ITK-${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" )
list( APPEND ELASTIX_DEPENDENCIES ${proj} )
list( APPEND SUPERELASTIX_DEPENDENCIES ${proj} )
......@@ -15,6 +15,6 @@ ExternalProject_Add( ${proj}
-DBOOST_ROOT:PATH=${BOOST_ROOT}
-DGTEST_ROOT:PATH=${GTEST_ROOT}
-DELASTIX_USE_FILE:PATH=${ELASTIX_USE_FILE}
DEPENDS ${ELASTIX_DEPENDENCIES}
DEPENDS ${SUPERELASTIX_DEPENDENCIES}
INSTALL_COMMAND ""
)
# ---------------------------------------------------------------------
# Dashboard configuration
mark_as_advanced( ELASTIX_DASHBOARD_SOURCE_DIR )
set( ELASTIX_DASHBOARD_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Testing/Dashboard" )
mark_as_advanced( SUPERELASTIX_DASHBOARD_SOURCE_DIR )
set( SUPERELASTIX_DASHBOARD_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Testing/Dashboard" )
mark_as_advanced( ELASTIX_DASHBOARD_BINARY_DIR )
set( ELASTIX_DASHBOARD_BINARY_DIR "${CMAKE_BINARY_DIR}/Testing/Dashboard" )
mark_as_advanced( SUPERELASTIX_DASHBOARD_BINARY_DIR )
set( SUPERELASTIX_DASHBOARD_BINARY_DIR "${CMAKE_BINARY_DIR}/Testing/Dashboard" )
mark_as_advanced( ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE )
set( ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE "selxLogstash.crt" )
mark_as_advanced( SUPERELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE )
set( SUPERELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE "selxLogstash.crt" )
mark_as_advanced( ELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY )
set( ELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY "selxLogstash.key" )
mark_as_advanced( SUPERELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY )
set( SUPERELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY "selxLogstash.key" )
mark_as_advanced( ELASTIX_DASHBOARD_VOLUME )
if( NOT EXISTS "${ELASTIX_DASHBOARD_VOLUME}" )
set( ELASTIX_DASHBOARD_VOLUME "${ELASTIX_DASHBOARD_BINARY_DIR}/Data" )
file( MAKE_DIRECTORY "${ELASTIX_DASHBOARD_VOLUME}" )
mark_as_advanced( SUPERELASTIX_DASHBOARD_VOLUME )
if( NOT EXISTS "${SUPERELASTIX_DASHBOARD_VOLUME}" )
set( ELASTIX_DASHBOARD_VOLUME "${SUPERELASTIX_DASHBOARD_BINARY_DIR}/Data" )
file( MAKE_DIRECTORY "${SUPERELASTIX_DASHBOARD_VOLUME}" )
endif()
# Test/Benchmark results will be forwarded to this IP. You will probably
# have change this in order to match docker settings on your own machine.
mark_as_advanced( ELASTIX_DASHBOARD_IP )
set( ELASTIX_DASHBOARD_IP "192.168.59.103" )
mark_as_advanced( SUPERELASTIX_DASHBOARD_IP )
set( SUPERELASTIX_DASHBOARD_IP "192.168.59.103" )
configure_file(
${ELASTIX_DASHBOARD_SOURCE_DIR}/selxDashboard.yml.in
${ELASTIX_DASHBOARD_BINARY_DIR}/selxDashboard.yml
${SUPERELASTIX_DASHBOARD_SOURCE_DIR}/selxDashboard.yml.in
${SUPERELASTIX_DASHBOARD_BINARY_DIR}/selxDashboard.yml
)
configure_file(
${ELASTIX_DASHBOARD_SOURCE_DIR}/selxLogstashForwarder.yml.in
${ELASTIX_DASHBOARD_BINARY_DIR}/selxLogstashForwarder.yml
${SUPERELASTIX_DASHBOARD_SOURCE_DIR}/selxLogstashForwarder.yml.in
${SUPERELASTIX_DASHBOARD_BINARY_DIR}/selxLogstashForwarder.yml
)
configure_file(
${ELASTIX_DASHBOARD_SOURCE_DIR}/selxLogstash.conf.in
${ELASTIX_DASHBOARD_BINARY_DIR}/Logstash/selxLogstash.conf
${SUPERELASTIX_DASHBOARD_SOURCE_DIR}/selxLogstash.conf.in
${SUPERELASTIX_DASHBOARD_BINARY_DIR}/Logstash/selxLogstash.conf
)
configure_file(
${ELASTIX_DASHBOARD_SOURCE_DIR}/selxLogstashForwarder.json.in
${ELASTIX_DASHBOARD_BINARY_DIR}/selxLogstashForwarder.json
${SUPERELASTIX_DASHBOARD_SOURCE_DIR}/selxLogstashForwarder.json.in
${SUPERELASTIX_DASHBOARD_BINARY_DIR}/selxLogstashForwarder.json
)
# ---------------------------------------------------------------------
......
elastix:
SuperElastix:
image: willdurand/elk
ports:
- "80:80"
......@@ -9,6 +9,6 @@ elastix:
data:
image: busybox
volumes:
- @ELASTIX_DASHBOARD_SOURCE_DIR@:/etc/ssl
- @ELASTIX_DASHBOARD_VOLUME@:/data
- @ELASTIX_DASHBOARD_BINARY_DIR@/Logstash:/etc/logstash
- @SUPERELASTIX_DASHBOARD_SOURCE_DIR@:/etc/ssl
- @SUPERELASTIX_DASHBOARD_VOLUME@:/data
- @SUPERELASTIX_DASHBOARD_BINARY_DIR@/Logstash:/etc/logstash
input {
lumberjack {
port => 5043
ssl_certificate => "/etc/ssl/@ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE@"
ssl_key => "/etc/ssl/@ELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY@"
ssl_certificate => "/etc/ssl/@SUPERELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE@"
ssl_key => "/etc/ssl/@SUPERELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY@"
}
}
......
{
"network": {
"servers": [ "elastix:5043" ],
"servers": [ "SuperElastix:5043" ],
"timeout": 15,
"ssl certificate": "/etc/ssl/@ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE@",
"ssl key": "/etc/ssl/@ELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY@",
"ssl ca": "/etc/ssl/@ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE@"
"ssl certificate": "/etc/ssl/@SUPERELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE@",
"ssl key": "/etc/ssl/@SUPERELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY@",
"ssl ca": "/etc/ssl/@SUPERELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE@"
},
"files": [
{
......@@ -13,7 +13,7 @@
],
"fields": {
"type": "unittest",
"lib": "elastix"
"lib": "SuperElastix"
}
},
{
......@@ -22,7 +22,7 @@
],
"fields": {
"type": "benchmark",
"lib": "elastix"
"lib": "SuperElastix"
}
}
]
......
forwarder:
image: willdurand/logstash-forwarder
extra_hosts:
- "elastix:@ELASTIX_DASHBOARD_IP@"
- "SuperElastix:@SUPERELASTIX_DASHBOARD_IP@"
volumes_from:
- data
data:
image: busybox
volumes:
- @ELASTIX_DASHBOARD_BINARY_DIR@/selxLogstashForwarder.json:/etc/logstash-forwarder/config.json
- @ELASTIX_DASHBOARD_SOURCE_DIR@:/etc/ssl
- @SUPERELASTIX_DASHBOARD_BINARY_DIR@/selxLogstashForwarder.json:/etc/logstash-forwarder/config.json
- @SUPERELASTIX_DASHBOARD_SOURCE_DIR@:/etc/ssl
- @CMAKE_BINARY_DIR@/Testing/Unit:/var/unit
- @CMAKE_BINARY_DIR@/Testing/Benchmark:/var/benchmark
......@@ -2,7 +2,7 @@
# To add a test to the build system, append it to the module's list of
# tests in the module's CMake file (e.g. "Modules/Core/ModuleCore.cmake").
# Any GoogleTests in these files are automatically added to CTest and
# the elastix dashboard.
# the SuperElastix dashboard.
# ---------------------------------------------------------------------
# Options
......@@ -22,7 +22,7 @@ endif()
if( NOT EXISTS ${SUPERELASTIX_UNITTEST_OUTPUT_DATA_DIR} )
message( FATAL_ERROR
"Could not create directory for output data. Make sure elastix has permission to write to disk."
"Could not create directory for output data. Make sure SuperElastix has permission to write to disk."
)
endif()
......
......@@ -4,7 +4,7 @@
#include "gtest/gtest.h"
/**
* This example demonstrates the elastix framework.
* This example demonstrates the SuperElastix framework.
* We run a couple of tests that outputs numbers for
* use on the dashboard.
*/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment