[CHANGE] As discussed yesterday math library will merge into common but stay in seperate directory

src/CMakeLists.txt

@@ -113,7 +113,6 @@ ENDIF()
 
 SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DDEBUG -O2" CACHE STRING "" FORCE )
 
-ADD_SUBDIRECTORY( math )
 ADD_SUBDIRECTORY( dataHandler )
 ADD_SUBDIRECTORY( graphicsEngine )
 ADD_SUBDIRECTORY( gui )

src/common/CMakeLists.txt

 FILE( GLOB COMMON_SRC "*.cpp" "*.h" )
 FILE( GLOB COMMON_DATASTRUCTURES_SRC "datastructures/*.cpp" "datastructures/*.h" )
 FILE( GLOB COMMON_EXCEPTIONS_SRC "exceptions/*.cpp" "exceptions/*.h" )
+FILE( GLOB MATH_SRC "math/*.cpp" "math/*.h" )
+FILE( GLOB FIBERSIMILARITY_SRC "math/fiberSimilarity/*.cpp" "math/fiberSimilarity/*.h" )
 
 ADD_SUBDIRECTORY( datastructures )
 ADD_SUBDIRECTORY( constraints )
+ADD_SUBDIRECTORY( math )
 
-ADD_LIBRARY( common ${COMMON_SRC} ${COMMON_DATASTRUCTURES_SRC} ${COMMON_EXCEPTIONS_SRC} )
-TARGET_LINK_LIBRARIES( common ${Boost_LIBRARIES} math )
+ADD_LIBRARY( common ${COMMON_SRC} ${COMMON_DATASTRUCTURES_SRC} ${COMMON_EXCEPTIONS_SRC} ${MATH_SRC} ${FIBERSIMILARITY_SRC} )
+TARGET_LINK_LIBRARIES( common ${Boost_LIBRARIES} )
 
 # Unit tests
 IF( OW_COMPILE_TESTS )

src/common/WPropertyTypes.h

@@ -33,7 +33,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include "../math/WPosition.h"
+#include "math/WPosition.h"
 #include "WColor.h"
 
 template < typename T >

src/common/datastructures/WTriangleMesh.h

@@ -27,8 +27,8 @@
 
 #include <vector>
 
-#include "../../math/WPosition.h"
-#include "../../math/WVector3D.h"
+#include "../math/WPosition.h"
+#include "../math/WVector3D.h"
 
 
 /**

src/common/datastructures/test/WTriangleMesh_test.h

@@ -30,7 +30,7 @@
 #include <cxxtest/TestSuite.h>
 
 #include "../WTriangleMesh.h"
-#include "../../../math/WVector3D.h"
+#include "../../math/WVector3D.h"
 
 
 /**

src/math/CMakeLists.txt → src/common/math/CMakeLists.txt

@@ -3,12 +3,10 @@ ADD_SUBDIRECTORY( fiberSimilarity )
 FILE( GLOB MATH_SRC "*.cpp" "*.h" )
 FILE( GLOB FIBERSIMILARITY_SRC "fiberSimilarity/*.cpp" "fiberSimilarity/*.h" )
 
-ADD_LIBRARY( math ${MATH_SRC} ${FIBERSIMILARITY_SRC} )
-
 # Unit tests
 IF( OW_COMPILE_TESTS )
   CXXTEST_ADD_TESTS_FROM_LIST( "${MATH_SRC}"
-                               "math;common"
+                               "common"
                                "WMath.cpp" # this declares only a namespace
                              )
 ENDIF( OW_COMPILE_TESTS )

src/math/WLine.cpp → src/common/math/WLine.cpp

@@ -26,9 +26,9 @@
 #include <iostream>
 #include <vector>
 
-#include "../common/WLimits.h"
-#include "../common/WStringUtils.h"
-#include "../common/exceptions/WOutOfBounds.h"
+#include "../WLimits.h"
+#include "../WStringUtils.h"
+#include "../exceptions/WOutOfBounds.h"
 #include "WLine.h"
 #include "WPosition.h"
 

src/math/WLine.h → src/common/math/WLine.h

@@ -29,7 +29,7 @@
 #include <iostream>
 #include <vector>
 
-#include "../common/WMixinVector.h"
+#include "../WMixinVector.h"
 #include "WPosition.h"
 
 // we need this to find the WLineTest class which is not inside wmath namespace

src/math/WValue.h → src/common/math/WValue.h

@@ -29,7 +29,7 @@
 #include <cmath>
 #include <vector>
 
-#include "../common/WStringUtils.h"
+#include "../WStringUtils.h"
 
 namespace wmath
 {