Commit 62d1b7f6 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'master' of ssh://geraldine.fjfi.cvut.cz/local/projects/tnl/tnl

parents ba6e3c72 417ba088

install

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=yes

WITH_CUDA=no

WITH_CUSPARSE=no

CUDA_ARCHITECTURE=2.0

TEMPLATE_EXPLICIT_INSTANTIATION=yes

tests/unit-tests/core/tnlObjectTester.h

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef TNLOBJECTTESTER_H_

#define TNLOBJECTTESTER_H_



#ifdef HAVE_CPPUNIT

#include <cppunit/TestSuite.h>

#include <cppunit/TestResult.h>

#include <cppunit/TestCaller.h>
@@ -55,4 +56,8 @@ class tnlObjectTester : public CppUnit :: TestCase 


};



#else /* HAVE_CPPUNIT */

class tnlObjectTester{};

#endif  /* HAVE_CPPUNIT */



#endif /* TNLOBJECTTESTER_H_ */