diff --git a/IDEs/qtcreator/include/detail/detail.pri b/IDEs/qtcreator/include/detail/detail.pri new file mode 100644 index 00000000..711972db --- /dev/null +++ b/IDEs/qtcreator/include/detail/detail.pri @@ -0,0 +1,12 @@ +HEADERS += \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/vector_assign.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/temporary.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/returntype_deduction.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/raw.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/matrix_assign.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/iterator.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/duff.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/documentation.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/definitions.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/config.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/detail/concepts.hpp diff --git a/IDEs/qtcreator/include/detail/detail.pro b/IDEs/qtcreator/include/detail/detail.pro deleted file mode 100644 index c933c5e5..00000000 --- a/IDEs/qtcreator/include/detail/detail.pro +++ /dev/null @@ -1,12 +0,0 @@ -HEADERS += \ - ../../../../include/boost/numeric/ublas/detail/vector_assign.hpp \ - ../../../../include/boost/numeric/ublas/detail/temporary.hpp \ - ../../../../include/boost/numeric/ublas/detail/returntype_deduction.hpp \ - ../../../../include/boost/numeric/ublas/detail/raw.hpp \ - ../../../../include/boost/numeric/ublas/detail/matrix_assign.hpp \ - ../../../../include/boost/numeric/ublas/detail/iterator.hpp \ - ../../../../include/boost/numeric/ublas/detail/duff.hpp \ - ../../../../include/boost/numeric/ublas/detail/documentation.hpp \ - ../../../../include/boost/numeric/ublas/detail/definitions.hpp \ - ../../../../include/boost/numeric/ublas/detail/config.hpp \ - ../../../../include/boost/numeric/ublas/detail/concepts.hpp diff --git a/IDEs/qtcreator/include/experimental/experimental.pri b/IDEs/qtcreator/include/experimental/experimental.pri new file mode 100644 index 00000000..41dc6c46 --- /dev/null +++ b/IDEs/qtcreator/include/experimental/experimental.pri @@ -0,0 +1,2 @@ +HEADERS += \ + $${INCLUDE_DIR}/boost/numeric/ublas/experimental/sparse_view.hpp diff --git a/IDEs/qtcreator/include/experimental/experimental.pro b/IDEs/qtcreator/include/experimental/experimental.pro deleted file mode 100644 index 2970a93d..00000000 --- a/IDEs/qtcreator/include/experimental/experimental.pro +++ /dev/null @@ -1,2 +0,0 @@ -HEADERS += \ - ../../../../include/boost/numeric/ublas/experimental/sparse_view.hpp diff --git a/IDEs/qtcreator/include/include.pro b/IDEs/qtcreator/include/include.pro index e8a22219..f4a92d06 100644 --- a/IDEs/qtcreator/include/include.pro +++ b/IDEs/qtcreator/include/include.pro @@ -1,33 +1,44 @@ -TEMPLATE = subdirs -SUBDIRS = detail experimental operation traits +TEMPLATE = lib +CONFIG += staticlib + +INCLUDE_DIR = ../../../include + +include(detail/detail.pri) +include(experimental/experimental.pri) +include(operation/operation.pri) +include(traits/traits.pri) + HEADERS += \ - ../../../include/boost/numeric/ublas/vector_sparse.hpp \ - ../../../include/boost/numeric/ublas/vector_proxy.hpp \ - ../../../include/boost/numeric/ublas/vector_of_vector.hpp \ - ../../../include/boost/numeric/ublas/vector_expression.hpp \ - ../../../include/boost/numeric/ublas/vector.hpp \ - ../../../include/boost/numeric/ublas/triangular.hpp \ - ../../../include/boost/numeric/ublas/traits.hpp \ - ../../../include/boost/numeric/ublas/tags.hpp \ - ../../../include/boost/numeric/ublas/symmetric.hpp \ - ../../../include/boost/numeric/ublas/storage_sparse.hpp \ - ../../../include/boost/numeric/ublas/storage.hpp \ - ../../../include/boost/numeric/ublas/operation_sparse.hpp \ - ../../../include/boost/numeric/ublas/operations.hpp \ - ../../../include/boost/numeric/ublas/operation_blocked.hpp \ - ../../../include/boost/numeric/ublas/operation.hpp \ - ../../../include/boost/numeric/ublas/matrix_sparse.hpp \ - ../../../include/boost/numeric/ublas/matrix_proxy.hpp \ - ../../../include/boost/numeric/ublas/matrix_expression.hpp \ - ../../../include/boost/numeric/ublas/matrix.hpp \ - ../../../include/boost/numeric/ublas/lu.hpp \ - ../../../include/boost/numeric/ublas/io.hpp \ - ../../../include/boost/numeric/ublas/hermitian.hpp \ - ../../../include/boost/numeric/ublas/fwd.hpp \ - ../../../include/boost/numeric/ublas/functional.hpp \ - ../../../include/boost/numeric/ublas/expression_types.hpp \ - ../../../include/boost/numeric/ublas/exception.hpp \ - ../../../include/boost/numeric/ublas/doxydoc.hpp \ - ../../../include/boost/numeric/ublas/blas.hpp \ - ../../../include/boost/numeric/ublas/banded.hpp \ - ../../../include/boost/numeric/ublas/assignment.hpp + $${INCLUDE_DIR}/boost/numeric/ublas/vector_sparse.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/vector_proxy.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/vector_of_vector.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/vector_expression.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/vector.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/triangular.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/traits.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/tags.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/symmetric.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/storage_sparse.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/storage.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation_sparse.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operations.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation_blocked.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/matrix_sparse.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/matrix_proxy.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/matrix_expression.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/matrix.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/lu.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/io.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/hermitian.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/fwd.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/functional.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/expression_types.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/exception.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/doxydoc.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/blas.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/banded.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/assignment.hpp + + +message($$HEADERS) diff --git a/IDEs/qtcreator/include/operation/operation.pri b/IDEs/qtcreator/include/operation/operation.pri new file mode 100644 index 00000000..519c4f4a --- /dev/null +++ b/IDEs/qtcreator/include/operation/operation.pri @@ -0,0 +1,7 @@ +HEADERS += \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation/size.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation/num_rows.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation/num_columns.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation/end.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation/c_array.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/operation/begin.hpp diff --git a/IDEs/qtcreator/include/operation/operation.pro b/IDEs/qtcreator/include/operation/operation.pro deleted file mode 100644 index 648e57bb..00000000 --- a/IDEs/qtcreator/include/operation/operation.pro +++ /dev/null @@ -1,7 +0,0 @@ -HEADERS += \ - ../../../../include/boost/numeric/ublas/operation/size.hpp \ - ../../../../include/boost/numeric/ublas/operation/num_rows.hpp \ - ../../../../include/boost/numeric/ublas/operation/num_columns.hpp \ - ../../../../include/boost/numeric/ublas/operation/end.hpp \ - ../../../../include/boost/numeric/ublas/operation/c_array.hpp \ - ../../../../include/boost/numeric/ublas/operation/begin.hpp diff --git a/IDEs/qtcreator/include/traits/traits.pri b/IDEs/qtcreator/include/traits/traits.pri new file mode 100644 index 00000000..de327dc6 --- /dev/null +++ b/IDEs/qtcreator/include/traits/traits.pri @@ -0,0 +1,4 @@ +HEADERS += \ + $${INCLUDE_DIR}/boost/numeric/ublas/traits/iterator_type.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/traits/const_iterator_type.hpp \ + $${INCLUDE_DIR}/boost/numeric/ublas/traits/c_array.hpp diff --git a/IDEs/qtcreator/include/traits/traits.pro b/IDEs/qtcreator/include/traits/traits.pro deleted file mode 100644 index 15d1bde2..00000000 --- a/IDEs/qtcreator/include/traits/traits.pro +++ /dev/null @@ -1,4 +0,0 @@ -HEADERS += \ - ../../../../include/boost/numeric/ublas/traits/iterator_type.hpp \ - ../../../../include/boost/numeric/ublas/traits/const_iterator_type.hpp \ - ../../../../include/boost/numeric/ublas/traits/c_array.hpp diff --git a/IDEs/qtcreator/ublas_develop.pro b/IDEs/qtcreator/ublas_develop.pro index 2ed1476d..8a22e242 100644 --- a/IDEs/qtcreator/ublas_develop.pro +++ b/IDEs/qtcreator/ublas_develop.pro @@ -1,2 +1,4 @@ TEMPLATE = subdirs +CONFIG -= qt +CONFIG += ordered SUBDIRS = include benchmarks test diff --git a/test/begin_end.cpp b/test/begin_end.cpp index 270aa4a8..769a51fa 100644 --- a/test/begin_end.cpp +++ b/test/begin_end.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" static const double TOL(1.0e-5); ///< Used for comparing two real numbers. diff --git a/test/num_columns.cpp b/test/num_columns.cpp index 568d4f2e..68c9770a 100644 --- a/test/num_columns.cpp +++ b/test/num_columns.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" BOOST_UBLAS_TEST_DEF( test_row_major_matrix_container ) diff --git a/test/num_rows.cpp b/test/num_rows.cpp index 4a96bd2f..1e3a1e70 100644 --- a/test/num_rows.cpp +++ b/test/num_rows.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" BOOST_UBLAS_TEST_DEF( test_row_major_matrix_container ) diff --git a/test/size.cpp b/test/size.cpp index 5976caab..1fd2f9de 100644 --- a/test/size.cpp +++ b/test/size.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" BOOST_UBLAS_TEST_DEF( test_vector_container ) diff --git a/test/test_assignment.cpp b/test/test_assignment.cpp index 4a3897c7..52453eb2 100644 --- a/test/test_assignment.cpp +++ b/test/test_assignment.cpp @@ -13,7 +13,7 @@ #include #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" #include #include diff --git a/test/test_complex_norms.cpp b/test/test_complex_norms.cpp index 041972ab..dbcaba43 100644 --- a/test/test_complex_norms.cpp +++ b/test/test_complex_norms.cpp @@ -8,7 +8,7 @@ #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" using namespace boost::numeric::ublas; diff --git a/test/test_coordinate_matrix_inplace_merge.cpp b/test/test_coordinate_matrix_inplace_merge.cpp index bf4701ac..b063665d 100644 --- a/test/test_coordinate_matrix_inplace_merge.cpp +++ b/test/test_coordinate_matrix_inplace_merge.cpp @@ -14,7 +14,7 @@ #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" using std::cout; using std::endl; diff --git a/test/test_coordinate_matrix_sort.cpp b/test/test_coordinate_matrix_sort.cpp index bf927fc5..d07abb3b 100644 --- a/test/test_coordinate_matrix_sort.cpp +++ b/test/test_coordinate_matrix_sort.cpp @@ -11,7 +11,7 @@ #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" using std::cout; using std::endl; diff --git a/test/test_coordinate_vector_inplace_merge.cpp b/test/test_coordinate_vector_inplace_merge.cpp index de703d6a..a914f805 100644 --- a/test/test_coordinate_vector_inplace_merge.cpp +++ b/test/test_coordinate_vector_inplace_merge.cpp @@ -14,7 +14,7 @@ #include #include -#include "libs/numeric/ublas/test/utils.hpp" +#include "utils.hpp" const double TOL = 1e-15; diff --git a/test/test_ticket7296.cpp b/test/test_ticket7296.cpp index 05c042b6..65fdb4ba 100644 --- a/test/test_ticket7296.cpp +++ b/test/test_ticket7296.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include "utils.hpp" namespace ublas = boost::numeric::ublas;