From 7ebb8f405bf852f00520f83d81996abaaf6ce16e Mon Sep 17 00:00:00 2001
From: Caner Candan <caner.candan@thalesgroup.com>
Date: Tue, 6 Jul 2010 01:27:14 +0200
Subject: [PATCH] config cmake

---
 CMakeLists.txt                    | 19 +++++++++----------
 application/cma_sa/CMakeLists.txt |  2 +-
 src/CMakeLists.txt                | 31 ++-----------------------------
 src/doStats.h                     |  5 +++++
 src/test.cpp                      |  4 ++++
 5 files changed, 21 insertions(+), 40 deletions(-)
 create mode 100644 src/test.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bc3de9b9..0ce2d1ab9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,13 +30,15 @@ SET(DO_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 ######################################################################################
 
 INCLUDE(FindDoxygen)
-
 INCLUDE(FindPkgConfig)
 
 PKG_CHECK_MODULES(EO eo REQUIRED)
+PKG_CHECK_MODULES(MO mo REQUIRED)
 
-INCLUDE_DIRECTORIES(${EO_INCLUDE_DIR})
-LINK_DIRECTORIES(${EO_LIBRARY_DIRS})
+INCLUDE_DIRECTORIES(
+  ${EO_INCLUDE_DIRS}
+  ${MO_INCLUDE_DIRS}
+  )
 
 ######################################################################################
 
@@ -95,14 +97,11 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
 
-ADD_LIBRARY(${PROJECT_NAME} STATIC ${SAMPLE_SRCS})
-#ADD_LIBRARY(${PROJECT_NAME} SHARED ${SAMPLE_SRCS})
+ADD_LIBRARY(do STATIC ${SAMPLE_SRCS})
+INSTALL(TARGETS do ARCHIVE DESTINATION lib COMPONENT libraries)
+
+######################################################################################
 
-# INSTALL(
-#   TARGETS ${LIBRARY_OUTPUT_PATH}/lib${PROJECT_NAME}.a
-#   DESTINATION lib
-#   COMPONENT libraries
-#   )
 
 ######################################################################################
 ### 9) Include packaging
diff --git a/application/cma_sa/CMakeLists.txt b/application/cma_sa/CMakeLists.txt
index 5336cc4c5..d4c9092ad 100644
--- a/application/cma_sa/CMakeLists.txt
+++ b/application/cma_sa/CMakeLists.txt
@@ -16,4 +16,4 @@ ENDFOREACH(file)
 FILE(GLOB SOURCES *.cpp)
 
 ADD_EXECUTABLE(cma_sa ${SOURCES})
-TARGET_LINK_LIBRARIES(cma_sa ${PROJECT_NAME} ${EO_LIBRARIES})
+TARGET_LINK_LIBRARIES(cma_sa do ${EO_LIBRARIES} ${MO_LIBRARIES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a9beb5c7c..1e45136a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,36 +1,9 @@
 ######################################################################################
-### 1) Include useful packages
+### 1) Set all needed source files for the project
 ######################################################################################
 
-#FIND_PACKAGE(Boost 1.33.0 REQUIRED)
-
-######################################################################################
-
-
-######################################################################################
-### 2) Include the sources
-######################################################################################
-
-#INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-
-######################################################################################
-
-
-######################################################################################
-### 3) Define your target(s)
-######################################################################################
-
-SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
-
 FILE(GLOB SOURCES *.cpp)
+
 SET(SAMPLE_SRCS ${SOURCES} PARENT_SCOPE)
 
-ADD_LIBRARY(${PROJECT_NAME} STATIC ${SAMPLE_SRCS})
-
-# INSTALL(
-#   TARGETS ${LIBRARY_OUTPUT_PATH}/lib${PROJECT_NAME}.a
-#   DESTINATION lib
-#   COMPONENT libraries
-#   )
-
 ######################################################################################
diff --git a/src/doStats.h b/src/doStats.h
index b5ac32b25..c46a72932 100644
--- a/src/doStats.h
+++ b/src/doStats.h
@@ -15,6 +15,9 @@
  *          Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifndef _doStats_h
+#define _doStats_h
+
 #include <cassert>
 #include <vector>
 
@@ -119,3 +122,5 @@ class CovMatrix {
     double get_cov(int i, int j) const { return sumcov[i][j] / (n-1); }
 
 };
+
+#endif // !_doStats_h
diff --git a/src/test.cpp b/src/test.cpp
new file mode 100644
index 000000000..97e5ab2cc
--- /dev/null
+++ b/src/test.cpp
@@ -0,0 +1,4 @@
+namespace DO
+{
+    void	test(){}
+}