cmakelist commit

CMakeLists.txt

@@ -7,10 +7,12 @@ 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})
 
+set(NICE_BUILD_LIBS_STATIC_SHARED STATIC)
+
 IF(WIN32)
   MESSAGE(FATAL_ERROR "not yet ready")
 ENDIF(WIN32) 

core/CMakeLists.txt

@@ -20,3 +20,15 @@ ADD_SUBDIRECTORY(algebra)
 ADD_SUBDIRECTORY(vector)
 ADD_SUBDIRECTORY(optimization)
 ADD_SUBDIRECTORY(image)
+
+#SET(core_src 
+#${core_basics_src} 
+#${core_algebra_src}
+#${core_vector_src}
+#${core_optimization}
+#${core_image}
+#)
+
+#MESSAGE(STATUS "${core_src}")
+
+#ADD_LIBRARY(core ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_src})

core/algebra/CMakeLists.txt

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

core/basics/CMakeLists.txt

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

core/basics/progs/CMakeLists.txt

@@ -0,0 +1,9 @@
+
+ADD_EXECUTABLE(testConfig testConfig.cpp)
+ADD_EXECUTABLE(testMemoryUsage testMemoryUsage.cpp) 
+
+TARGET_LINK_LIBRARIES(testConfig core_basics)
+TARGET_LINK_LIBRARIES(testMemoryUsage core_basics)
+
+INSTALL(TARGETS testConfig DESTINATION bin)
+INSTALL(TARGETS testMemoryUsage DESTINATION bin)

core/image/CMakeLists.txt

@@ -47,6 +47,6 @@ RectT.tcc
 Region.cpp
 )
 
-ADD_LIBRARY(core_image ${core_image_src})
+ADD_LIBRARY(core_image ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_image_src})
 
 INSTALL(TARGETS core_image DESTINATION libs)

core/optimization/blackbox/CMakeLists.txt

@@ -8,6 +8,6 @@ SimpleOptimizer.cpp
 SimpleOptProblem.cpp
 )
 
-ADD_LIBRARY(core_optimization_blackbox SHARED ${core_optimization_blackbox_src})
+ADD_LIBRARY(core_optimization_blackbox ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_optimization_blackbox_src})
 
 INSTALL(TARGETS core_optimization_blackbox DESTINATION libs)

core/optimization/gradientBased/CMakeLists.txt

@@ -8,6 +8,6 @@ SecondOrderTrustRegion.cpp
 TrustRegionBase.cpp
 )
 
-ADD_LIBRARY(core_optimization_gradientBased SHARED ${core_optimization_gradientBased_src})
+ADD_LIBRARY(core_optimization_gradientBased ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_optimization_gradientBased_src})
 
 INSTALL(TARGETS core_optimization_gradientBased DESTINATION libs)

core/vector/CMakeLists.txt

@@ -11,6 +11,6 @@ VectorT.tcc
 VVector.cpp
 )
 
-ADD_LIBRARY(core_vector SHARED ${core_vector_src})
+ADD_LIBRARY(core_vector ${NICE_BUILD_LIBS_STATIC_SHARED} ${core_vector_src})
 
 INSTALL(TARGETS core_vector DESTINATION libs)