Skip to content

Commit 27ea56a

Browse files
committed
Version 1604, Revision 2
1 parent 7af2a74 commit 27ea56a

File tree

174 files changed

+8692
-6848
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+8692
-6848
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ In other versioning schemes, this would have been version **2.0**.
7171
* Logging **Exceptions** (recursively with inner exceptions)
7272
* Logging **XML trees**
7373

74-
* C++ version accepts arbitrary **3rd party string types**. No need to convert, e.g. a *QString* before logging it although ALox is not built on QT! This goal was reached by underlying A-Worx utility library *ALib* (open source, MIT License) which greatly [solved that problem](http://alexworx.github.io/ALox-Logging-Library/cpp_ref/namespaceaworx_1_1lib_1_1strings.html) using some *template meta programming* to relieve us from the (disastrous) string mix in the C++ world.
74+
* C++ version accepts arbitrary **3rd party string types**. This goal was reached by underlying A-Worx utility library *ALib* (open source, MIT License) which greatly [solved that problem](http://alexworx.github.io/ALox-Logging-Library/cpp_ref/namespaceaworx_1_1lib_1_1strings.html) using some *template meta programming* to relieve us from the (disastrous) string mix in the C++ world.
7575
On the same token, conversion of **user defined types** to loggable (string) objects is supported. After implementing the conversion once, you can just throw your custom types into ALox log statements, even as a part of a concatenated log message.
7676

7777
* and finally: ALox is under **continuous development**. You're invited to contribute!

build/cmake.cpp/ALib_Base.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# initialize things
2727
# -------------------------------------------------------------------------------------------------
2828
# set version
29-
set( ALIB_VERSION "1604R1" )
29+
set( ALIB_VERSION "1604R2" )
3030

3131
if (ALIB_SRC_DIR)
3232
message( "ALib_Base.cmake: Already included (included twice!)" )
@@ -149,7 +149,7 @@ set( ALIB_EXTERNAL_LIBS ${ALIB_EXTERNAL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
149149

150150
if ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" )
151151
# add -H to generate output "!/x" for use of precompiled header
152-
set( AWORX_COMPILE_FLAGS "-Wall -Wextra -Werror -std=c++11" )
152+
set( AWORX_COMPILE_FLAGS "-Wall -Wextra -Werror -std=c++11 -fPIC" )
153153

154154
# add coverage flags to GCC
155155
if( ${AWORX_COVERAGE_COMPILE} )

build/cmake.cpp/alox.lib/CMakeLists.txt

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
project("ALox_Static_Library")
1919
cmake_minimum_required( VERSION 3.1.0 ) ###FATAL_ERROR)
2020

21-
# enable modules in project path #TODO: is this to be able to include ../*.cmake? test this and document it better
21+
# enable modules in project path
2222
set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.")
2323

2424

@@ -33,35 +33,43 @@
3333
#set( ALIB_DEBUG_STRINGS "On" )
3434
#set( ALIB_FEAT_THREADS "Off" )
3535
#set( ALOX_DBG_LOG "Off" )
36-
#set( ALOX_DBG_LOG_CI "Off" )
36+
#set( ALOX_DBG_LOG_CI "Off" )
3737
#set( ALOX_REL_LOG "Off" )
3838
#set( ALOX_REL_LOG_CI "On" )
3939

4040
set ( ALOX_BASE_DIR "../../.." )
4141
include( ${ALOX_BASE_DIR}/build/cmake.cpp/ALox_Base.cmake )
4242

43-
4443
# -------------------------------------------------------------------------------------------------
45-
# cotire (set precompiled headers)
44+
# Precompiled headers with 'cotire' CMake script.
45+
# More Info at: https://github.com/sakra/cotire/
46+
#
47+
# Note:
48+
# To disable, just comment (enable) the whole section below. By default, this is disabled
49+
# when publishing the project, because cotire adds potential complexity. E.g. somtimes a
50+
# make clean does not seem to work if CMake files were changed. In this case, the whole build
51+
# folder needs to be deleted.
4652
# -------------------------------------------------------------------------------------------------
4753

48-
include(${ALIB_BASE_DIR}/build/cmake.cpp/cotire.cmake)
49-
50-
set_target_properties( ALox_StaticLib PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT
51-
"${ALIB_SRC_DIR}/alib/stdafx_alib.h" )
52-
cotire ( ALox_StaticLib )
53-
54-
# cotire sets the following properties
55-
set ( _dumppname "ALox_StaticLib" )
56-
get_target_property( _unitySource ${_dumppname} COTIRE_CXX_UNITY_SOURCE )
57-
get_target_property( _prefixHeader ${_dumppname} COTIRE_CXX_PREFIX_HEADER )
58-
get_target_property( _precompiledHeader ${_dumppname} COTIRE_CXX_PRECOMPILED_HEADER)
59-
get_target_property( _unityTargetName ${_dumppname} COTIRE_UNITY_TARGET_NAME )
60-
61-
message(STATUS "${_dumppname} unity source: ${_unitySource}")
62-
message(STATUS "${_dumppname} prefix header: ${_prefixHeader}")
63-
message(STATUS "${_dumppname} precompiled header: ${_precompiledHeader}")
64-
message(STATUS "${_dumppname} unity target: ${_unityTargetName}")
54+
# include(${ALIB_BASE_DIR}/build/cmake.cpp/cotire.cmake)
55+
#
56+
# set_target_properties( ALox_StaticLib PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT
57+
# "${ALIB_SRC_DIR}/alib/stdafx_alib.h" )
58+
# cotire ( ALox_StaticLib )
59+
60+
61+
#------- dump cotire properties -------
62+
63+
# set ( _dumppname "ALox_StaticLib" )
64+
# get_target_property( _unitySource ${_dumppname} COTIRE_CXX_UNITY_SOURCE )
65+
# get_target_property( _prefixHeader ${_dumppname} COTIRE_CXX_PREFIX_HEADER )
66+
# get_target_property( _precompiledHeader ${_dumppname} COTIRE_CXX_PRECOMPILED_HEADER)
67+
# get_target_property( _unityTargetName ${_dumppname} COTIRE_UNITY_TARGET_NAME )
68+
#
69+
# message(STATUS "${_dumppname} unity source: ${_unitySource}")
70+
# message(STATUS "${_dumppname} prefix header: ${_prefixHeader}")
71+
# message(STATUS "${_dumppname} precompiled header: ${_precompiledHeader}")
72+
# message(STATUS "${_dumppname} unity target: ${_unityTargetName}")
6573

6674

6775
# -------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)