Reintegrated needed changes in the log4cplus CMakeLists.txt files.

Updated the .gitignore file


Former-commit-id: e2de059cb7

.gitignore

@@ -1,6 +1,6 @@
 ##Third-Party libs
-resources/3rdparty/log4cplus-1.1.2-rc2/
-resources/3rdparty/gtest-1.6.0/
+resources/3rdparty/log4cplus-1.1.3-rc1/
+resources/3rdparty/gtest-1.7.0/
 resources/3rdparty/eigen/
 resources/3rdparty/gmm-4.2/
 resources/3rdparty/cudd-2.5.0/

resources/3rdparty/log4cplus-1.1.3-rc1/CMakeLists.txt

@@ -44,6 +44,7 @@ endif (WIN32)
 if (MSVC)
   set (LOG4CPLUS_WORKING_LOCALE_DEFAULT ON)
 else (MSVC)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
   set (LOG4CPLUS_WORKING_LOCALE_DEFAULT OFF)
 endif (MSVC)
 
@@ -72,9 +73,13 @@ if (NOT ${BUILD_SHARED_LIBS})
   set (log4cplus_postfix "${log4cplus_postfix}S")
 endif()
 
-if (UNICODE)
+if (UNICODE AND (DEFINED LOG4CPLUS_USE_UNICODE AND LOG4CPLUS_USE_UNICODE))
   set (log4cplus_postfix "${log4cplus_postfix}U")
-endif (UNICODE)
+  message(STATUS "Log4CPlus - Using Unicode: YES")
+else()
+  message(STATUS "Log4CPlus - Using Unicode: NO")
+  set(UNICODE OFF)
+endif()
 
 if (WITH_ICONV)
   set(LOG4CPLUS_WITH_ICONV 1)

resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt

@@ -51,7 +51,7 @@ set (log4cplus_sources
 
 #message (STATUS "Type: ${UNIX}|${CYGWIN}|${WIN32}")
 
-if ("${UNIX}" OR "${CYGWIN}")
+if ("${UNIX}" OR "${CYGWIN}" OR APPLE)
   set (log4cplus_sources ${log4cplus_sources}
     socket-unix.cxx)
 elseif (WIN32)
@@ -67,6 +67,8 @@ endif ()
 
 if (UNICODE)
   add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
+else(UNICODE)
+  add_definitions (-UUNICODE -U_UNICODE -DMBCS -D_MBCS)
 endif (UNICODE)
 if (WIN32)
   add_definitions (-DMINGW_HAS_SECURE_API=1)