Changeset 236 in pacpusframework for trunk/cmake

Timestamp:

11/28/13 17:07:16 (11 years ago)

Author:

Marek Kurdej

Message:

Experimental: using global logger object instead of trivial logger. Added: stub for colored log output on Linux.

Location:

trunk/cmake

Files:

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

trunk/cmake/PacpusConfiguration.cmake

@@ -19 +19 @@
 # Global configuration
 # ========================================
-set(PACPUS_USE_LOG      TRUE  CACHE BOOL "Logging using log4cxx, the library is required")
+set(PACPUS_USE_LOG      TRUE  CACHE BOOL "Logging using Boost.Log, the library is required")
+set(PACPUS_LOG_COLORED_OUTPUT FALSE CACHE BOOL "Logging in color.")
 set(PACPUS_INSTALL_3RD  FALSE CACHE BOOL "Installation of the 3rd party")
 set(PACPUS_BUILD_DOC    FALSE CACHE BOOL "Whether build the documentation - requires Doxygen")
@@ -32 +33 @@
     endif()
 endif(PACPUS_USE_SOLUTION_FOLDERS)
+
+if(PACPUS_LOG_COLORED_OUTPUT)
+    list(APPEND PACPUS_DEFINITIONS " -DPACPUS_LOG_COLORED_OUTPUT=1 ")
+endif()

trunk/cmake/PacpusDependencies.cmake

@@ -10 +10 @@
 ################################################################################
 # OUTPUT
-set(PACPUS_DEFINITIONS "")
 set(PACPUS_DEPENDENCIES_INC "")
 set(PACPUS_DEPENDENCIES_LIB "")
@@ -120 +119 @@
             log
             log_setup
+            system
     )
     include_directories(${Boost_INCLUDE_DIRS})

trunk/cmake/PacpusUtilities.cmake

@@ -345 +345 @@
         TARGETS ${ARGV}
         RUNTIME DESTINATION ${PACPUS_INSTALL_DIR}/bin
-        LIBRARY DESTINATION ${PACPUS_INSTALL_DIR}/lib
+        LIBRARY DESTINATION ${PACPUS_INSTALL_DIR}/bin
         ARCHIVE DESTINATION ${PACPUS_INSTALL_DIR}/lib
     )