Commit fb9a8c36 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'Move_Math_Tools' into 'master'

Move math tools

Moved the Math Tools directory into libs_required

See merge request !209
parents 54e42f3f 9868991e
Pipeline #3895 failed with stage
in 48 minutes and 29 seconds
......@@ -2,6 +2,11 @@
# Required 3.1 to set C++11
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
# Convenience checks for problems
if(EXISTS ${CMAKE_SOURCE_DIR}/libs_required/OpenMesh)
message(FATAL_ERROR "Directory libs_required/OpenMesh has been moved to OpenFlipper/libs_required/OpenMesh! Please remove the old directory if it's still there!")
endif()
# Set and enforce C++-11 flags
set( CMAKE_CXX_STANDARD_REQUIRED TRUE )
set( CMAKE_CXX_STANDARD 11 )
......
......@@ -128,7 +128,7 @@ void icp(const std::vector< VectorT >& _points1 , const std::vector< VectorT >&
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(ICP_C)
#define ICP_TEMPLATES
#include "ICP.cc"
#include "ICPT.cc"
#endif
//=============================================================================
#endif // ICP_HH defined
......
......@@ -83,7 +83,7 @@ sane_normalized( VectorT _vec);
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(MATH_TOOLS_C)
#define MATH_TOOLS_TEMPLATES
#include "Math_Tools.cc"
#include "Math_ToolsT.cc"
#endif
//=============================================================================
#endif // ACG_GEODESICFASTMARCHT_HH defined
......
......@@ -136,7 +136,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(PCA_C)
#define PCA_TEMPLATES
#include "PCA.cc"
#include "PCAT.cc"
#endif
//=============================================================================
#endif // PCA_HH defined
......
......@@ -20,6 +20,7 @@ A detailed compilation manual is available [here](http://openflipper.org/Documen
Latest NEWS
===========
- 12/09/2016: Moved Math_Tools to OpenFlipper/libs_required/Math_Tools
- 12/09/2016: Moved OpenMesh directory into OpenFlipper subdirectory OpenFlipper/libs_required/OpenMesh
** You might have to delete your libs_required/OpenMesh directory manually if you get cmake errors regarding duplicate targets **
- 12/09/2016: Moved ACG directory into OpenFlipper subdirectory OpenFlipper/libs_required/ACG
......
Markdown is supported
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