diff --git a/.gitignore b/.gitignore index 0191619d..e47ef87b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ /.svn /doc/rtf _unsused -*.user* \ No newline at end of file +CMakeLists.txt.user* \ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 49c4d1be..68c51388 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,7 +6,7 @@ macro(pip_test NAME LIBS) set(_target pip_${NAME}_test) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PIP_ROOT_BINARY_DIR}") add_executable(${_target} ${_CPPS} ${_HDRS}) - target_link_libraries(${_target} pip ${LIBS} gtest_main gmock_main) + target_link_libraries(${_target} pip ${LIBS} gtest_main gmock_main) add_test(NAME ${_target} COMMAND tests) add_custom_target(${_target}_perform ALL COMMAND ${_target}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY) diff --git a/tests/math/testpimathmatrix.cpp b/tests/math/testpimathmatrix.cpp index 3dc1943a..fb7109fb 100644 --- a/tests/math/testpimathmatrix.cpp +++ b/tests/math/testpimathmatrix.cpp @@ -1,8 +1,7 @@ #include "gtest/gtest.h" #include "pimathmatrix.h" -template -bool cmpSquareMatrixWithValue(PIMathMatrix matrix, Type val, int num) { +bool cmpSquareMatrixWithValue(PIMathMatrix matrix, double val, int num) { bool b = true; for(int i = 0; i < num; i++) { for(int j = 0; j < num; j++) { diff --git a/tests/math/testpimathmatrixt.cpp b/tests/math/testpimathmatrixt.cpp index d7f11563..df96a01c 100644 --- a/tests/math/testpimathmatrixt.cpp +++ b/tests/math/testpimathmatrixt.cpp @@ -4,8 +4,7 @@ const uint rows = 3; const uint cols = 3; -template -bool cmpSquareMatrixWithValue(PIMathMatrixT matrix, Type val, int num) { +bool cmpSquareMatrixWithValue(PIMathMatrixT matrix, double val, int num) { bool b = true; for(int i = 0; i < num; i++) { for(int j = 0; j < num; j++) {