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

Merge branch 'develop' into ELASTIX-144-blueprint-pimple-refactor

parents 3e48626c 0a1a4c61
......@@ -41,7 +41,7 @@
#include "elxElastixFilter.h"
#include "boost/log/trivial.hpp"
//#include "boost/log/trivial.hpp"
namespace selx
{
......@@ -87,11 +87,11 @@ public:
virtual int Update( ConflictinUpdateInterface * ) = 0;
};
class LogInterface
{
public:
virtual std::stringstream Log( boost::log::trivial::severity_level severity_level ) = 0;
};
//class LogInterface
//{
//public:
// virtual std::stringstream Log( boost::log::trivial::severity_level severity_level ) = 0;
//};
template< int Dimensionality, class TPixel >
class itkImageInterface
......
......@@ -24,17 +24,25 @@ set( proj BOOST )
# while on Windows, we need CR/LF line feeds (only available in the .zip)
set( BOOST_CONFIGURE_COMMAND )
set( B2_ARGS --with-program_options --with-filesystem --with-log address-model=64 )
if( UNIX )
set( BOOST_URL "http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz")
set( BOOST_MD5 51528a0e3b33d9e10aaa311d9eb451e3 )
set( BOOST_CONFIGURE_COMMAND ./bootstrap.sh )
set( BOOST_BUILD_COMMAND ./b2 --with-program_options --with-filesystem --with-log address-model=64)
set( BOOST_BUILD_COMMAND ./b2 ${B2_ARGS})
else()
if( WIN32 )
if(MSVC11)
set(B2_ARGS "--toolset=msvc-11.0" ${B2_ARGS})
elseif(MSVC12)
set(B2_ARGS "--toolset=msvc-12.0" ${B2_ARGS})
elseif(MSVC14)
set(B2_ARGS "--toolset=msvc-14.0" ${B2_ARGS})
endif(MSVC11)
set( BOOST_URL "http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.zip")
set( BOOST_MD5 08d29a2d85db3ebc8c6fdfa3a1f2b83c )
set( BOOST_CONFIGURE_COMMAND cmd /C bootstrap.bat msvc )
set( BOOST_BUILD_COMMAND b2.exe --with-program_options --with-filesystem --with-log address-model=64)
set( BOOST_BUILD_COMMAND b2.exe ${B2_ARGS})
endif()
endif()
......
......@@ -20,7 +20,7 @@
set( proj Elastix )
set( ELASTIX_GIT_REPOSITORY http://github.com/kaspermarstal/elastix )
set( ELASTIX_GIT_TAG 41c558e3d4c33421451d2498059f0c3cf1a4da75 )
set( ELASTIX_GIT_TAG fa451dd33ac72dbded40dbf408db2c4e958469ac )
ExternalProject_Add( ${proj}
GIT_REPOSITORY ${ELASTIX_GIT_REPOSITORY}
......
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