Changeset 239 in pacpusframework for trunk/cmake

Timestamp:

Nov 29, 2013, 6:39:11 PM (11 years ago)

Author:

Marek Kurdej

Message:

Added: possibility to use color log output (needs more testing).

Location:

trunk/cmake

Files:

• PacpusConfiguration.cmake (modified) (1 diff)
• PacpusDependencies.cmake (modified) (2 diffs)

trunk/cmake/PacpusConfiguration.cmake

@@ -34 +34 @@
 endif(PACPUS_USE_SOLUTION_FOLDERS)
 
+
+if(PACPUS_USE_LOG)
+    list(APPEND PACPUS_DEFINITIONS " -DPACPUS_USE_LOG=1 ")
+endif()
+
 if(PACPUS_LOG_COLORED_OUTPUT)
     list(APPEND PACPUS_DEFINITIONS " -DPACPUS_LOG_COLORED_OUTPUT=1 ")

trunk/cmake/PacpusDependencies.cmake

@@ -102 +102 @@
 ################################################################################
 # Boost
+set(Boost_USE_STATIC_LIBS       OFF)
+set(Boost_USE_MULTITHREADED      ON)
+set(Boost_USE_STATIC_RUNTIME    OFF)
 list(APPEND PACPUS_DEFINITIONS " -DBOOST_ALL_DYN_LINK ")
-find_package(Boost 1.32.0
+find_package(Boost 1.54.0
     COMPONENTS
-        program_options
+        program_options #1.32.0
 )
 if(Boost_FOUND)
@@ -114 +117 @@
 endif()
 if(PACPUS_USE_LOG)
-    list(APPEND PACPUS_DEFINITIONS " -DPACPUS_USE_LOG ")
     find_package(Boost 1.54.0 REQUIRED
         COMPONENTS
-            log
+            #filesystem
+            log # 1.54.0
             log_setup
-            system
+            #system
     )
     include_directories(${Boost_INCLUDE_DIRS})