Changeset 141 in pacpusframework for branches/2.0-beta1/cmake/PacpusDependencies.cmake

Timestamp:

07/30/13 17:48:06 (11 years ago)

Author:

Marek Kurdej

Message:

Major update: using Boost.Log if PACPUS_USE_LOG is true.
Added: overloaded operator<< for QString (explicit instantiation).

File:

• branches/2.0-beta1/cmake/PacpusDependencies.cmake (modified) (1 diff)

branches/2.0-beta1/cmake/PacpusDependencies.cmake

@@ -91 +91 @@
 # Do not use compiled modules, include-only headers.
 # ========================================
-#find_package(Boost 1.49.0 REQUIRED)
-#list(APPEND PACPUS_DEPENDENCIES_INC ${Boost_INCLUDE_DIRS})
-
-# ========================================
-# log4cxx
-# ========================================
 if(PACPUS_USE_LOG)
-    if(WIN32 AND MSVC AND IS_BUILDING_PACPUS)
-        set(LOG4CXX_ROOT ${PACPUS_3RD_PARTY_DIR}/apache-log4cxx)
-    endif()
-
-    find_package(log4cxx REQUIRED)
-
     list(APPEND PACPUS_DEFINITIONS " -DPACPUS_USE_LOG ")
-    list(APPEND PACPUS_DEPENDENCIES_INC ${LOG4CXX_INCLUDE_DIRS})
-    list(APPEND PACPUS_DEPENDENCIES_LIB ${LOG4CXX_LIBRARIES})
-
-    # If needed, install the dll of log4cxx
-    if(WIN32 AND MSVC AND IS_BUILDING_PACPUS)
-        pacpus_get_msvc(MSVC_VERSION)
-        pacpus_purge_backslash(LOG4CXX_ROOT)
-
-        install(
-            FILES
-                ${LOG4CXX_ROOT}/bin/${MSVC_VERSION}/log4cxx.dll
-                ${LOG4CXX_ROOT}/bin/${MSVC_VERSION}/log4cxx_d.dll
-            DESTINATION
-                ${PACPUS_INSTALL_DIR}/bin
-        )
-    endif()
+    list(APPEND PACPUS_DEFINITIONS " -DBOOST_ALL_DYN_LINK ")
+    
+    find_package(Boost 1.54.0 REQUIRED
+        COMPONENTS
+            log
+    )
+    include_directories(${Boost_INCLUDE_DIRS})
+    link_directories(${Boost_LIBRARY_DIRS})
+    
+    list(APPEND PACPUS_DEPENDENCIES_INC ${Boost_INCLUDE_DIRS})
+    list(APPEND PACPUS_DEPENDENCIES_LIB ${Boost_LIBRARIES})
 endif()