added CMakeLists

CMakeLists.txt

@@ -7,7 +7,7 @@ include(CheckSymbolExists)
 set(NICELibrary_VERSION_MAJOR 1)
 set(NICELibrary_VERSION_MINOR 0)
 
-set(CMAKE_VERBOSE_MAKEFILE on) 
+#set(CMAKE_VERBOSE_MAKEFILE on) 
 
 set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR})
 
@@ -54,4 +54,4 @@ FIND_PROGRAM(DOXYGEN_EXECUTABLE "doxygen")
 # add the install targets
 #install (TARGETS ImageLabeler DESTINATION bin)
 #install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h"        
-#         DESTINATION include)
+#         DESTINATION include)

core/CMakeLists.txt

@@ -1,6 +1,16 @@
 
 INCLUDE_DIRECTORIES(basics)
 INCLUDE_DIRECTORIES(algebra)
+INCLUDE_DIRECTORIES(vector)
+INCLUDE_DIRECTORIES(optimization)
+INCLUDE_DIRECTORIES(image)
+#INCLUDE_DIRECTORIES(iceconversion)
+#INCLUDE_DIRECTORIES(imagedisplay)
+#INCLUDE_DIRECTORIES(matlabAccess)
+#INCLUDE_DIRECTORIES(progs)
 
-ADD_SUBDIRECTORY(basics bin)
-ADD_SUBDIRECTORY(algebra bin2)
+ADD_SUBDIRECTORY(basics)
+ADD_SUBDIRECTORY(algebra)
+ADD_SUBDIRECTORY(vector)
+ADD_SUBDIRECTORY(optimization)
+ADD_SUBDIRECTORY(image)

core/algebra/CMakeLists.txt

@@ -3,4 +3,6 @@ CholeskyRobust.cpp        EigValuesTRLAN.cpp  GMSparseVectorMatrix.cpp  ILSConju
 DiagonalMatrixApprox.cpp  GBCDSolver.cpp      GMStandard.cpp            ILSMinResLanczos.cpp              IterativeLinearSolver.cpp
 )
 
-ADD_LIBRARY(libcore_algebra SHARED ${core_algebra_src}) 
+ADD_LIBRARY(core_algebra SHARED ${core_algebra_src}) 
+
+INSTALL(TARGETS core_algebra DESTINATION libs)

core/basics/CMakeLists.txt

@@ -4,4 +4,6 @@ Config.cpp         FileName.cpp          numerictools.cpp  Streamable.cpp
 Exception.cpp      FrameRateCounter.cpp  Observable.cpp    StringTools.cpp
 )
 
-ADD_LIBRARY(libcore_basics SHARED ${core_basics_src})
+ADD_LIBRARY(core_basics SHARED ${core_basics_src})
+
+INSTALL(TARGETS core_basics DESTINATION libs)

core/basics/assert.h

@@ -1,66 +0,0 @@
-/*
- * NICE-Core - efficient algebra and computer vision methods
- *  - libfbasics - library of some basic tools
- * See file License for license information.
- */
-#ifndef _ASSERT_H_
-#define _ASSERT_H_
-
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <core/basics/types.h>
-
-#include <core/basics/Exception.h>
-
-namespace NICE {
-
-//#define assert(t) if (!t) {cout << "Assertion failed." << endl;}
-
-/**
- * Deprecated! A simple assertion function.
- * @deprecated Use fassert() or fassert2() instead
- */
-inline void assert2(const bool t, const std::string& message = std::string()) {
-  if (!t) {
-    std::cerr << "Assertion failed. " << message << std::endl;
-    //std::stringstream s;
-    //s << "Assertion failed: " << message;
-    //fthrow(Exception, s.str());
-  }
-}
-
-/**
- * A simple assertion function. (Behavior might be changed in the future.)
- */
-inline void __assert(const bool exp,
-                     std::string message = std::string(),
-                     std::string code = std::string(),
-                     const char* file = "",
-                     uint line = 0) {
-  if (!exp) {
-    //std::cerr << "Assertion failed. " << message << std::endl;
-    std::stringstream s;
-    s << "Assertion failed in file " << file << " at line " << line
-      << ". Code: '" << code << "'";
-    if (message.size() > 0) {
-      s << " Message: '" << message << "'";
-    }
-    s << ".";
-//     std::cerr << s.str() << std::endl;
-//     fthrow(Exception, s.str());
-    std::string* buffer = new std::string(s.str());
-    fthrow(Exception, *buffer);
-  }
-}
-
-#define fassert(exp) NICE::__assert((exp), "", #exp,__FILE__,__LINE__)
-#define fassert2(exp, msg) \
-{ \
-  std::stringstream s; \
-  s << msg; \
-  NICE::__assert((exp), s.str(), #exp,__FILE__,__LINE__); \
-}
-
-} // namespace
-#endif // _ASSERT_H_

core/image/CMakeLists.txt

@@ -0,0 +1,52 @@
+set( core_image_src Algorithms.cpp
+BlockImageAccessT.tcc
+Buffer.tcc
+CircleT.tcc
+ColorImageAccess.cpp
+ColorImageT.cpp
+ColorImageT.tcc
+ColorT.tcc
+Convert.cpp
+Convert.tcc
+CrossT.tcc
+DeprecatedConverter.cpp
+DeprecatedConverter.tcc
+EllipseT.tcc
+Filter.cpp
+Filter.tcc
+FilterT.cpp
+FilterT.tcc
+Fourier.cpp
+GaussPyramid.cpp
+GHough.cpp
+GrayColorImageCommonImplementation.cpp
+GrayColorImageCommonImplementationT.tcc
+Histogram.cpp
+ImageAccess.cpp
+ImageAccessT.tcc
+ImageFile.cpp
+ImageFileListReader.cpp
+ImageFileListWriter.cpp
+ImageFile.tcc
+ImageInputStream.cpp
+ImageOutputStream.cpp
+ImageT.cpp
+ImageTools.cpp
+ImageTools.tcc
+ImageT.tcc
+ippwrapper.tcc
+LineT.tcc
+Morph.cpp
+Morph.tcc
+MultiChannelImageT.cpp
+MultiChannelImageT.tcc
+Pixel.tcc
+PointT.tcc
+RectangleT.tcc
+RectT.tcc
+Region.cpp
+)
+
+ADD_LIBRARY(core_image ${core_image_src})
+
+INSTALL(TARGETS core_image DESTINATION libs)

core/optimization/CMakeLists.txt

@@ -0,0 +1,7 @@
+
+INCLUDE_DIRECTORIES(blackbox)
+INCLUDE_DIRECTORIES(gradientBased)
+
+ADD_SUBDIRECTORY(blackbox)
+ADD_SUBDIRECTORY(gradientBased)
+

core/optimization/blackbox/CMakeLists.txt

@@ -0,0 +1,13 @@
+SET(core_optimization_blackbox_src CostFunction.cpp
+DimWrapperCostFunction.cpp
+DownhillSimplexOptimizer.cpp
+Optimizable.cpp
+Optimizer.cpp
+OptLogBase.cpp
+SimpleOptimizer.cpp
+SimpleOptProblem.cpp
+)
+
+ADD_LIBRARY(core_optimization_blackbox SHARED ${core_optimization_blackbox_src})
+
+INSTALL(TARGETS core_optimization_blackbox DESTINATION libs)

core/optimization/gradientBased/CMakeLists.txt

@@ -0,0 +1,13 @@
+set(core_optimization_gradientBased_src FirstOrderRasmussen.cpp
+FirstOrderTrustRegion.cpp
+OptimizationAlgorithmFirst.cpp
+OptimizationAlgorithmSecond.cpp
+OptimizationProblemFirst.cpp
+OptimizationProblemSecond.cpp
+SecondOrderTrustRegion.cpp
+TrustRegionBase.cpp
+)
+
+ADD_LIBRARY(core_optimization_gradientBased SHARED ${core_optimization_gradientBased_src})
+
+INSTALL(TARGETS core_optimization_gradientBased DESTINATION libs)

core/vector/CMakeLists.txt

@@ -0,0 +1,16 @@
+SET(core_vector_src Algorithms.cpp Algorithms.tcc
+Distance.cpp
+Distance.tcc
+Eigen.tcc
+ippwrapper.cpp
+ippwrapper.tcc
+MatrixT.tcc
+RowMatrixT.tcc
+SparseVectorT.tcc
+VectorT.tcc
+VVector.cpp
+)
+
+ADD_LIBRARY(core_vector SHARED ${core_vector_src})
+
+INSTALL(TARGETS core_vector DESTINATION libs)