Changes to the directory structure.

.appveyor.yml

@@ -47,7 +47,7 @@ build_script:
     - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DBOOST_ROOT="%BOOST_DIR%" ^
         -DBoost_USE_STATIC_LIBS=ON -DCMAKE_CXX_STANDARD=%CPP_STD% -DCMAKE_INSTALL_PREFIX=install ^
         -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCC_MQTT5_BUILD_UNIT_TESTS=ON ^
-        -DCC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES=%APPVEYOR_BUILD_FOLDER%/client/script/BareMetalConfig.cmake
+        -DCC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES=%APPVEYOR_BUILD_FOLDER%/client/lib/script/BareMetalConfig.cmake
     - cmake --build . --config %CONFIGURATION% --target install --parallel %NUMBER_OF_PROCESSORS%
 
 

.github/workflows/actions_build.yml

@@ -51,7 +51,7 @@ jobs:
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
           -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
           -DCC_MQTT5_WITH_SANITIZERS=ON -DCC_MQTT5_BUILD_UNIT_TESTS=ON -DCC_MQTT5_BUILD_INTEGRATION_TESTS=ON \
-          -DCC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES=$GITHUB_WORKSPACE/client/script/BareMetalConfig.cmake
+          -DCC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES=$GITHUB_WORKSPACE/client/lib/script/BareMetalConfig.cmake
       env:
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
@@ -119,7 +119,7 @@ jobs:
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
           -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
           -DCC_MQTT5_WITH_SANITIZERS=ON -DCC_MQTT5_BUILD_UNIT_TESTS=ON -DCC_MQTT5_BUILD_INTEGRATION_TESTS=ON \
-          -DCC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES=$GITHUB_WORKSPACE/client/script/BareMetalConfig.cmake
+          -DCC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES=$GITHUB_WORKSPACE/client/lib/script/BareMetalConfig.cmake
       env:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}

client/CMakeLists.txt

@@ -1,260 +1,2 @@
-if ((NOT CC_MQTT5_CLIENT_DEFAULT_LIB) OR
-    (CC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES STREQUAL ""))
-    return()
-endif ()
-
-
-######################################################################
-
-set (HEADER_TEMPL ${CMAKE_CURRENT_SOURCE_DIR}/templ/client.h.templ)
-set (SRC_TEMPL ${CMAKE_CURRENT_SOURCE_DIR}/templ/client.cpp.templ)
-set (CONFIG_TEMPL ${CMAKE_CURRENT_SOURCE_DIR}/templ/Config.h.templ)
-set (PROT_OPTS_TEMPL ${CMAKE_CURRENT_SOURCE_DIR}/templ/ProtocolOptions.h.templ)
-set (TEMPL_PROCESS_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/script/ProcessTemplate.cmake)
-set (WRITE_CONFIG_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/script/WriteConfigHeader.cmake)
-set (WRITE_PROT_OPTS_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/script/WriteProtocolOptions.cmake)
-set (DEFAULT_CONFIG_VARS_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/script/DefineDefaultConfigVars.cmake)
-set (DEFAULT_CLIENT_DIR_NAME "default")
-set (COMMON_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-######################################################################
-
-function (gen_lib_mqtt5_client config_file)
-    if (NOT "${config_file}" STREQUAL "")
-        include (${config_file})
-    endif()
-
-    set (name "${CC_MQTT5_CLIENT_CUSTOM_NAME}")
-    if ("${CC_MQTT5_CLIENT_CUSTOM_NAME}" STREQUAL "")
-        set (dir ${DEFAULT_CLIENT_DIR_NAME})
-        set (lib_name "cc_mqtt5_client")
-    else ()
-        set (dir "${CC_MQTT5_CLIENT_CUSTOM_NAME}")
-        set (name "${name}_")
-        set (lib_name "cc_mqtt5_${name}client")
-    endif ()
-
-    execute_process(
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${dir})    
-
-    set (header_output ${CMAKE_CURRENT_BINARY_DIR}/${dir}/${name}client.h)
-    set (src_output ${CMAKE_CURRENT_BINARY_DIR}/${dir}/${name}client.cpp)
-    set (config_output ${CMAKE_CURRENT_BINARY_DIR}/${dir}/Config.h)
-    set (prot_opts_output ${CMAKE_CURRENT_BINARY_DIR}/${dir}/ProtocolOptions.h)
-
-    # ---------------------------------    
-
-    add_custom_command(
-        OUTPUT "${header_output}"
-        COMMAND ${CMAKE_COMMAND} 
-            -DIN_FILE="${HEADER_TEMPL}"
-            -DOUT_FILE="${header_output}"
-            -DNAME="${name}"
-            -P ${TEMPL_PROCESS_SCRIPT}
-        DEPENDS ${HEADER_TEMPL} ${TEMPL_PROCESS_SCRIPT}
-    )
-
-    set_source_files_properties(
-        ${header_output}
-        PROPERTIES GENERATED TRUE
-    )
-
-    set (header_tgt_name "${name}client.h.tgt") 
-    add_custom_target(
-        ${header_tgt_name}
-        DEPENDS "${header_output}" ${HEADER_TEMPL} ${TEMPL_PROCESS_SCRIPT}
-    )
-
-    # ---------------------------------
-
-    add_custom_command(
-        OUTPUT "${src_output}"
-        COMMAND ${CMAKE_COMMAND} 
-            -DIN_FILE="${SRC_TEMPL}"
-            -DOUT_FILE="${src_output}"
-            -DNAME="${name}"
-            -P ${TEMPL_PROCESS_SCRIPT}
-        DEPENDS ${SRC_TEMPL} ${TEMPL_PROCESS_SCRIPT}
-    )
-
-    set_source_files_properties(
-        ${src_output}
-        PROPERTIES GENERATED TRUE
-    )
-
-    set (src_tgt_name "${name}client.cpp.tgt") 
-    add_custom_target(
-        ${src_tgt_name}
-        DEPENDS "${src_output}" ${SRC_TEMPL} ${TEMPL_PROCESS_SCRIPT}
-    )
-
-    # ---------------------------------
-
-    add_custom_command(
-        OUTPUT "${config_output}"
-        COMMAND ${CMAKE_COMMAND} 
-            -DCMAKE_CONFIG_FILE="${config_file}"
-            -DCMAKE_DEFAULT_CONFIG_VARS="${DEFAULT_CONFIG_VARS_SCRIPT}"
-            -DCONFIG_HEADER_TEMPL="${CONFIG_TEMPL}"
-            -DOUT_FILE="${config_output}"
-            -P ${WRITE_CONFIG_SCRIPT}
-        DEPENDS ${config_file} ${CONFIG_TEMPL} ${WRITE_CONFIG_SCRIPT} ${DEFAULT_CONFIG_VARS_SCRIPT}
-    )
-
-    set_source_files_properties(
-        ${config_output}
-        PROPERTIES GENERATED TRUE
-    )
-
-    set (config_tgt_name "${name}Config.h.tgt") 
-    add_custom_target(
-        ${config_tgt_name}
-        DEPENDS "${config_output}" ${CONFIG_TEMPL} ${WRITE_CONFIG_SCRIPT}
-    )    
-
-    # ---------------------------------
-
-    add_custom_command(
-        OUTPUT "${prot_opts_output}"
-        COMMAND ${CMAKE_COMMAND} 
-            -DCMAKE_CONFIG_FILE="${config_file}"
-            -DCMAKE_DEFAULT_CONFIG_VARS="${DEFAULT_CONFIG_VARS_SCRIPT}"
-            -DPROT_OPTS_HEADER_TEMPL="${PROT_OPTS_TEMPL}"
-            -DOUT_FILE="${prot_opts_output}"
-            -P ${WRITE_PROT_OPTS_SCRIPT}
-        DEPENDS ${config_file} ${PROT_OPTS_TEMPL} ${WRITE_PROT_OPTS_SCRIPT}
-    )
-
-    set_source_files_properties(
-        ${prot_opts_output}
-        PROPERTIES GENERATED TRUE
-    )
-
-    set (prot_opts_tgt_name "${name}ProtocolOptions.h.tgt") 
-    add_custom_target(
-        ${prot_opts_tgt_name}
-        DEPENDS "${prot_opts_output}" ${PROT_OPTS_TEMPL} ${WRITE_PROT_OPTS_SCRIPT}
-    )    
-
-    # ---------------------------------    
-
-    message (STATUS "Defining library ${lib_name}") 
-    set (src
-        src/op/ConnectOp.cpp
-        src/op/DisconnectOp.cpp
-        src/op/KeepAliveOp.cpp
-        src/op/Op.cpp
-        src/op/ReauthOp.cpp
-        src/op/RecvOp.cpp
-        src/op/SendOp.cpp
-        src/op/SubscribeOp.cpp
-        src/op/UnsubscribeOp.cpp
-        src/ClientImpl.cpp
-        src/TimerMgr.cpp
-    )
-    add_library (${lib_name} STATIC ${src} ${src_output})
-    add_library (cc::${lib_name} ALIAS ${lib_name})
-    target_link_libraries(${lib_name} PRIVATE cc::cc_mqtt5 cc::comms)
-    target_include_directories(
-            ${lib_name} BEFORE
-                PUBLIC
-                    $<INSTALL_INTERFACE:include>
-                    $<BUILD_INTERFACE:${COMMON_INC_DIR}>
-                    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${dir}>
-                PRIVATE 
-                    ${CMAKE_CURRENT_SOURCE_DIR}/src)    
-
-    set_target_properties(
-        ${lib_name} PROPERTIES 
-        INTERFACE_LINK_LIBRARIES ""
-    )
-    add_dependencies(${lib_name} ${header_tgt_name} ${src_tgt_name} ${config_tgt_name} ${prot_opts_tgt_name})
-
-    if (NOT "${extra_flags}" STREQUAL "")
-        string(REPLACE ";" " " extra_flags "${extra_flags}")
-
-        set_target_properties(
-            ${lib_name} PROPERTIES 
-            COMPILE_FLAGS ${extra_flags}
-        )
-    endif ()
-
-    install (
-        FILES ${header_output}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cc_mqtt5_client
-    )
-
-    install (
-        TARGETS ${lib_name}
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        EXPORT ${lib_name}Config
-    )
-
-    install(EXPORT ${lib_name}Config NAMESPACE cc::
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${lib_name}/cmake
-    )        
-
-    if (DOXYGEN_FOUND)
-        set (doc_output_dir "${CMAKE_INSTALL_FULL_DATAROOTDIR}/doc/${lib_name}")
-        make_directory (${doc_output_dir})
-
-        set (match_str "OUTPUT_DIRECTORY[^\n]*")
-        set (replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")
-        set (output_file "${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf")
-
-        if (NOT "${CC_MQTT5_CLIENT_CUSTOM_NAME}" STREQUAL "")
-            set (output_file "${CMAKE_CURRENT_BINARY_DIR}/doxygen_${CC_MQTT5_CLIENT_CUSTOM_NAME}.conf")
-        endif ()        
-
-        set (config_file "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/doxygen.conf")
-        file (READ ${config_file} config_text)
-        string (REGEX REPLACE "${match_str}" "${replacement_str}" modified_config_text "${config_text}")
-        file (WRITE "${output_file}" "${modified_config_text}")
-
-        set (interface_doc_dir "${CMAKE_CURRENT_BINARY_DIR}/interface_doc")
-        if (NOT "${CC_MQTT5_CLIENT_CUSTOM_NAME}" STREQUAL "")
-            set (interface_doc_dir "${interface_doc_dir}_${CC_MQTT5_CLIENT_CUSTOM_NAME}")
-        endif ()           
-
-        execute_process(
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${interface_doc_dir})
-
-        set (doc_tgt_name "doc_cc_mqtt5_client")
-        if (NOT "${CC_MQTT5_CLIENT_CUSTOM_NAME}" STREQUAL "")
-            set (doc_tgt_name "doc_cc_mqtt5_${CC_MQTT5_CLIENT_CUSTOM_NAME}_client")
-        endif ()           
-
-        add_custom_target (${doc_tgt_name}
-                COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-                    ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/main.dox 
-                    ${CMAKE_CURRENT_SOURCE_DIR}/include/cc_mqtt5_client/common.h
-                    "${header_output}" 
-                    ${interface_doc_dir}/ 
-                COMMAND ${DOXYGEN_EXECUTABLE} ${output_file}
-                WORKING_DIRECTORY ${interface_doc_dir})
-
-        add_dependencies(${doc_tgt_name} ${header_tgt_name})           
-    endif ()    
-endfunction()
-
-######################################################################
-
-find_package (Doxygen)
-
-install (
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/cc_mqtt5_client
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-if (CC_MQTT5_CLIENT_DEFAULT_LIB) 
-    gen_lib_mqtt5_client("")
-endif ()
-
-if (NOT "${CC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES}" STREQUAL "")
-    foreach (custom_config ${CC_MQTT5_CUSTOM_CLIENT_CONFIG_FILES})
-        gen_lib_mqtt5_client("${custom_config}")
-    endforeach ()
-endif ()
-
-add_subdirectory(test)
-add_subdirectory(app)
+add_subdirectory (lib)
+add_subdirectory (app)