浏览代码

added cmakelists for core/algebra

Johannes Ruehle 12 年之前
父节点
当前提交
79d74d1da4
共有 3 个文件被更改,包括 15 次插入8 次删除
  1. 5 0
      core/algebra/CMakeLists.txt
  2. 0 8
      core/algebra/CMakeLists.txt.old
  3. 10 0
      core/algebra/progs/CMakeLists.txt

+ 5 - 0
core/algebra/CMakeLists.txt

@@ -0,0 +1,5 @@
+ocv_add_module(algebra)
+
+ocv_module_include_directories()
+ocv_glob_module_sources()
+ocv_create_module()

+ 0 - 8
core/algebra/CMakeLists.txt.old

@@ -1,8 +0,0 @@
-SET(core_algebra_src CholeskyRobustAuto.cpp    EigValues.cpp       GenericMatrix.cpp         ILSConjugateGradients.cpp         ILSPlainGradient.cpp       LUDecomposition.cpp
-CholeskyRobust.cpp        EigValuesTRLAN.cpp  GMSparseVectorMatrix.cpp  ILSConjugateGradientsLanczos.cpp  ILSSymmLqLanczos.cpp
-DiagonalMatrixApprox.cpp  GBCDSolver.cpp      GMStandard.cpp            ILSMinResLanczos.cpp              IterativeLinearSolver.cpp
-)
-
-ADD_LIBRARY(core_algebra ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_algebra_src}) 
-
-INSTALL(TARGETS core_algebra DESTINATION libs)

+ 10 - 0
core/algebra/progs/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+ADD_EXECUTABLE(testILSConjugateGradients testILSConjugateGradients.cpp)
+#ADD_EXECUTABLE(testMemoryUsage testMemoryUsage.cpp) 
+
+message(STATUS "boost_Libraries: ${Boost_LIBRARIES}")
+TARGET_LINK_LIBRARIES(testILSConjugateGradients libnice_core_algebra libnice_core_basics ${Boost_LIBRARIES})
+#TARGET_LINK_LIBRARIES(testMemoryUsage libnice_core_basics libnice_core_vector)
+
+INSTALL(TARGETS testILSConjugateGradients DESTINATION bin)
+#INSTALL(TARGETS testMemoryUsage DESTINATION bin)