Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
6db48da5
Commit
6db48da5
authored
Mar 04, 2010
by
Mathias Goldau
Browse files
[CHANGE] As discussed yesterday math library will merge into common but stay in seperate directory
parent
7482627a
Changes
102
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
15 additions
and
15 deletions
+15
-15
src/CMakeLists.txt
src/CMakeLists.txt
+0
-1
src/common/CMakeLists.txt
src/common/CMakeLists.txt
+5
-2
src/common/WPropertyTypes.h
src/common/WPropertyTypes.h
+1
-1
src/common/datastructures/WTriangleMesh.h
src/common/datastructures/WTriangleMesh.h
+2
-2
src/common/datastructures/test/WTriangleMesh_test.h
src/common/datastructures/test/WTriangleMesh_test.h
+1
-1
src/common/math/CMakeLists.txt
src/common/math/CMakeLists.txt
+1
-3
src/common/math/WFiber.cpp
src/common/math/WFiber.cpp
+0
-0
src/common/math/WFiber.h
src/common/math/WFiber.h
+0
-0
src/common/math/WLine.cpp
src/common/math/WLine.cpp
+3
-3
src/common/math/WLine.h
src/common/math/WLine.h
+1
-1
src/common/math/WLinearAlgebraFunctions.cpp
src/common/math/WLinearAlgebraFunctions.cpp
+0
-0
src/common/math/WLinearAlgebraFunctions.h
src/common/math/WLinearAlgebraFunctions.h
+0
-0
src/common/math/WMath.cpp
src/common/math/WMath.cpp
+0
-0
src/common/math/WMath.h
src/common/math/WMath.h
+0
-0
src/common/math/WMatrix.cpp
src/common/math/WMatrix.cpp
+0
-0
src/common/math/WMatrix.h
src/common/math/WMatrix.h
+0
-0
src/common/math/WPosition.cpp
src/common/math/WPosition.cpp
+0
-0
src/common/math/WPosition.h
src/common/math/WPosition.h
+0
-0
src/common/math/WValue.cpp
src/common/math/WValue.cpp
+0
-0
src/common/math/WValue.h
src/common/math/WValue.h
+1
-1
No files found.
src/CMakeLists.txt
View file @
6db48da5
...
...
@@ -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
View file @
6db48da5
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
View file @
6db48da5
...
...
@@ -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
View file @
6db48da5
...
...
@@ -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
View file @
6db48da5
...
...
@@ -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
View file @
6db48da5
...
...
@@ -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/WFiber.cpp
→
src/
common/
math/WFiber.cpp
View file @
6db48da5
File moved
src/math/WFiber.h
→
src/
common/
math/WFiber.h
View file @
6db48da5
File moved
src/math/WLine.cpp
→
src/
common/
math/WLine.cpp
View file @
6db48da5
...
...
@@ -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
View file @
6db48da5
...
...
@@ -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/WLinearAlgebraFunctions.cpp
→
src/
common/
math/WLinearAlgebraFunctions.cpp
View file @
6db48da5
File moved
src/math/WLinearAlgebraFunctions.h
→
src/
common/
math/WLinearAlgebraFunctions.h
View file @
6db48da5
File moved
src/math/WMath.cpp
→
src/
common/
math/WMath.cpp
View file @
6db48da5
File moved
src/math/WMath.h
→
src/
common/
math/WMath.h
View file @
6db48da5
File moved
src/math/WMatrix.cpp
→
src/
common/
math/WMatrix.cpp
View file @
6db48da5
File moved
src/math/WMatrix.h
→
src/
common/
math/WMatrix.h
View file @
6db48da5
File moved
src/math/WPosition.cpp
→
src/
common/
math/WPosition.cpp
View file @
6db48da5
File moved
src/math/WPosition.h
→
src/
common/
math/WPosition.h
View file @
6db48da5
File moved
src/math/WValue.cpp
→
src/
common/
math/WValue.cpp
View file @
6db48da5
File moved
src/math/WValue.h
→
src/
common/
math/WValue.h
View file @
6db48da5
...
...
@@ -29,7 +29,7 @@
#include <cmath>
#include <vector>
#include "../
common/
WStringUtils.h"
#include "../WStringUtils.h"
namespace
wmath
{
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment