Fixed some unix-specific issues.

CMakeLists.txt

@@ -164,6 +164,11 @@ if (LOG4CPLUS_INCLUDE_DIR)
     include_directories(${LOG4CPLUS_INCLUDE_DIR})
     target_link_libraries(mrmc ${LOG4CPLUS_LIBRARY}) 
     target_link_libraries(mrmc-tests ${LOG4CPLUS_LIBRARY})
+    # On Linux, we have to link against librt
+    if (UNIX)
+	target_link_libraries(mrmc rt)
+	target_link_libraries(mrmc-tests rt)
+    endif(UNIX)
 endif(LOG4CPLUS_INCLUDE_DIR)
 
 if (THREADS_FOUND)
@@ -176,4 +181,4 @@ endif(THREADS_FOUND)
 configure_file (
   "${PROJECT_SOURCE_DIR}/mrmc-config.h.in"
   "${PROJECT_BINARY_DIR}/mrmc-config.h"
-)
+)

resources/3rdparty/log4cplus-1.1.0/CMakeLists.txt

@@ -6,13 +6,14 @@ set (log4cplus_version_minor 1)
 set (log4cplus_version_patch 0)
 set (log4cplus_soversion 0)
 set (log4cplus_postfix "")
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++0x)
 
 option(LOG4CPLUS_BUILD_TESTING "Build the test suite." ON)
 
 find_package (Threads)
 message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}")
 
-set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library")
+set(BUILD_SHARED_LIBS FALSE CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library")
 
 if (WIN32)
   set (UNICODE_DEFAULT ON)

src/vector/bitvector.h

@@ -10,7 +10,7 @@
 #include "src/exceptions/invalid_argument.h"
 #include "src/exceptions/out_of_range.h"
 
-#include <iostream>
+#include <string.h>
 
 namespace mrmc {