Merge branch 'KjellKod-master'

Author: oriolvidalteruel

API.markdown

@@ -168,7 +168,7 @@ Example code for replacing the default log formatting for "full details" formatt
    handle->call(&g3::FileSink::overrideLogDetails, &LogMessage::FullLogDetailsToString);
 ```
 
-See [test_message.cpp](http://www.github.com/KjellKod/g3log/test_unit/test_message.cpp) for details and testing
+See [test_message.cpp](test_unit/test_message.cpp) for details and testing
 
 
 Example code for overloading the formatting of a custom sink. The log formatting function will be passed into the 
@@ -324,7 +324,7 @@ The default behaviour for G3log is to catch several fatal events before they for
    ```
 
    ### <a name="fatal_handling_disabled">Disable fatal handling</a>
-   Fatal signal handling can be disabled with a CMake option: `ENABLE_FATAL_SIGNALHANDLING`. See [Options.cmake](https://github.com/KjellKod/g3log/blob/master/Options.cmake) for more details
+   Fatal signal handling can be disabled with a CMake option: `ENABLE_FATAL_SIGNALHANDLING`. See [Options.cmake](Options.cmake) for more details
 
 
    ### <a name="PID1">PID1 Fatal Signal Recommendations</a>

Build.cmake

@@ -77,8 +77,12 @@
 # require here some proxy for c++14 standard to avoid problems TARGET_PROPERTY CXX_STANDARD
 #TARGET_COMPILE_FEATURES(${G3LOG_LIBRARY} PUBLIC cxx_variable_templates)
 
- 
-TARGET_INCLUDE_DIRECTORIES(${G3LOG_LIBRARY} PUBLIC ${LOG_SRC} "${CMAKE_CURRENT_BINARY_DIR}/include")
+TARGET_INCLUDE_DIRECTORIES(${G3LOG_LIBRARY}
+   PUBLIC
+      $<BUILD_INTERFACE:${LOG_SRC}>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+)
+
 SET(ACTIVE_CPP0xx_DIR "Release")
 
 # find corresponding thread lib (e.g. whether -lpthread is needed or not)

CMakeLists.txt

@@ -166,12 +166,8 @@ message( STATUS "Software Version: ${VERSION}" )
 
 
 
-
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    # ==========================================================================
-   #        Only tested on Ubuntu, CentOS and OSX.
-   #        For OSX you can also install an older version using 'brew install'
-   #
+   # CMAKE INSTALL AND CPACK OPTIONS:
    # ==========================================================================
    #
    #   Alternative 1:
@@ -182,18 +178,13 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
    #   Alternative 2:
    #      usage: make; sudo make install
    #
+   #   For OSX you can also install an older version using 'brew install'
+   #
    # ==========================================================================
    INCLUDE (${g3log_SOURCE_DIR}/CPackLists.txt)
-ENDIF()
+
 
 IF(MINGW)
-   # ==========================================================================
-   #
-   #   usage: make; make install
-   #
-   # ==========================================================================
-   INCLUDE (${g3log_SOURCE_DIR}/CPackLists.txt)
-   
    # this enables strerror_s
    ADD_DEFINITIONS(-DMINGW_HAS_SECURE_API)
 ENDIF()

CPackLists.txt

@@ -6,25 +6,18 @@
 # For more information see g3log/LICENSE or refer refer to http://unlicense.org
 # ============================================================================*/
 
- #  INSTALL( TARGETS g3logger_shared
- #           ARCHIVE
- #           LIBRARY DESTINATION lib/g3log
- #           COMPONENT libraries)
-
- #  INSTALL( FILES ${HEADER_FILES}
- #           DESTINATION include
- #           COMPONENT headers)
-
-IF(NOT MINGW)
-   IF(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-      SET(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-   ELSEIF(NOT CPACK_PACKAGING_INSTALL_PREFIX)
-      SET(CPACK_PACKAGING_INSTALL_PREFIX /usr/local)
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+   IF(NOT CPACK_PACKAGING_INSTALL_PREFIX)
+      IF(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+         SET(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+      ELSE()
+         SET(CPACK_PACKAGING_INSTALL_PREFIX /usr/local)
+      ENDIF()
    ENDIF()
 ENDIF()
 
-SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output dir for libraries")
-SET(CMAKE_INSTALL_HEADERDIR include CACHE PATH "Output dir for headers")
+INCLUDE(CMakePackageConfigHelpers)
+INCLUDE(GNUInstallDirs)
 
 SET(CPACK_PACKAGE_NAME g3log)
 SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})
@@ -37,33 +30,35 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION})
 SET(CPACK_PACKAGE_CONTACT "Kjell Hedstrom hedstrom@kjellkoc.cc")
 SET(CPACK_RESOURCE_FILE_LICENSE  ${g3log_SOURCE_DIR}/LICENSE)
 SET(CPACK_PACKAGE_VENDOR "KjellKod")
-SET(CMAKE_INSTALL_HEADERDIR ${CMAKE_INSTALL_HEADERDIR}/g3log)
 
-IF(NOT MINGW)
-   INSTALL( TARGETS g3logger
-               ARCHIVE DESTINATION ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-               LIBRARY DESTINATION ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-               COMPONENT libraries)
-
-   INSTALL( FILES ${HEADER_FILES}
-               DESTINATION ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_HEADERDIR}
-               COMPONENT headers)
-
-   INSTALL( FILES ${PROJECT_SOURCE_DIR}/cmake/g3loggerConfig.cmake
-               DESTINATION ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/g3logger)
-ELSE()
-   INSTALL( TARGETS g3logger
-               ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-               COMPONENT libraries)
-
-   INSTALL( FILES ${HEADER_FILES}
-               DESTINATION ${CMAKE_INSTALL_HEADERDIR}
-               COMPONENT headers)
-
-   INSTALL( FILES ${PROJECT_SOURCE_DIR}/cmake/g3loggerConfig.cmake
-               DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger)
-ENDIF()
+INSTALL( TARGETS g3logger
+            EXPORT g3logger-targets
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
+            INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+INSTALL( FILES ${HEADER_FILES}
+            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/g3log
+            COMPONENT headers)
+
+INSTALL(
+   EXPORT g3logger-targets
+   FILE g3loggerTargets.cmake
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
+)
+
+CONFIGURE_PACKAGE_CONFIG_FILE(
+   ${PROJECT_SOURCE_DIR}/cmake/g3loggerConfig.cmake
+   ${CMAKE_CURRENT_BINARY_DIR}/g3loggerConfig.cmake
+   INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
+)
+
+install(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/g3loggerConfig.cmake
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
+)
 
 SET(CPACK_COMPONENTS_ALL libraries headers)
 SET(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "G3Log libraries")
@@ -72,6 +67,8 @@ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "G3Log C++ headers")
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    SET(CPACK_GENERATOR "DEB")
    SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "KjellKod - Kjell Hedstrom")
+ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+   SET(CPACK_GENERATOR "ZIP") # Otherwise, NSIS is needed.
 ENDIF()
 
 message( STATUS "\nTo create installation package: " )
@@ -80,7 +77,7 @@ message( STATUS "make package" )
 message( STATUS "\nOption to install using 'make install'" )
 message( STATUS "Installation locations: " )
 message( STATUS "====================" )
-message( STATUS "Headers: ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_HEADERDIR}" )
+message( STATUS "Headers: ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/g3log" )
 message( STATUS "Library installation directory: ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
 
 message( STATUS "For more information please see g3log/CPackLists.txt\n\n" )
@@ -96,8 +93,6 @@ ENDIF()
 #  CPACK_PACKAGING_INSTALL_PREFIX
 #  CPACK_OUTPUT_FILE_PREFIX
 #  CMAKE_INSTALL_PREFIX
-#  CMAKE_INSTALL_HEADERDIR
-#  CMAKE_INSTALL_LIBDIR
 
 
    INCLUDE(CPack)

Options.cmake

@@ -83,7 +83,7 @@ ELSE()
 ENDIF(G3_LOG_FULL_FILENAME)
 
 
-# -DENABLE_FATAL_SIGNALHANDLING=ON   : defualt change the
+# -DENABLE_FATAL_SIGNALHANDLING=ON   : default change the
 # By default fatal signal handling is enabled. You can disable it with this option
 # enumerated in src/stacktrace_windows.cpp 
 option (ENABLE_FATAL_SIGNALHANDLING