From 2d77b63de3cff50f907b807c4aa04d36dbfdd32d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 29 Mar 2020 13:40:13 +0100 Subject: [PATCH] Created CMakeLists.txt files for QueuedFSM and QueuedMessageRouter example projects. --- examples/QueuedFSM/CMakeLists.txt | 17 +++++++++++++++++ examples/QueuedMessageRouter/CMakeLists.txt | 17 +++++++++++++++++ .../{vs2017 => }/etl_profile.h | 6 +----- .../vs2017/QueuedMessageRouter.vcxproj | 2 +- .../vs2017/QueuedMessageRouter.vcxproj.filters | 2 +- include/etl/version.h | 2 +- library.json | 2 +- library.properties | 2 +- support/Release notes.txt | 4 ++++ 9 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 examples/QueuedFSM/CMakeLists.txt create mode 100644 examples/QueuedMessageRouter/CMakeLists.txt rename examples/QueuedMessageRouter/{vs2017 => }/etl_profile.h (91%) diff --git a/examples/QueuedFSM/CMakeLists.txt b/examples/QueuedFSM/CMakeLists.txt new file mode 100644 index 00000000..5cd13b05 --- /dev/null +++ b/examples/QueuedFSM/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.5.0) +project(queued_fsm) + +add_definitions(-DETL_DEBUG) + +include_directories(${UTPP_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/../../include) + +set(SOURCE_FILES QueuedFSM.cpp) + +add_executable(queued_fsm ${SOURCE_FILES}) +target_include_directories(queued_fsm + PUBLIC + ${CMAKE_CURRENT_LIST_DIR} + ) + +set_property(TARGET queued_fsm PROPERTY CXX_STANDARD 17) + diff --git a/examples/QueuedMessageRouter/CMakeLists.txt b/examples/QueuedMessageRouter/CMakeLists.txt new file mode 100644 index 00000000..2c11fe31 --- /dev/null +++ b/examples/QueuedMessageRouter/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.5.0) +project(queued_message_router) + +add_definitions(-DETL_DEBUG) + +include_directories(${UTPP_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/../../include) + +set(SOURCE_FILES QueuedMessageRouter.cpp) + +add_executable(queued_message_router ${SOURCE_FILES}) +target_include_directories(queued_message_router + PUBLIC + ${CMAKE_CURRENT_LIST_DIR} + ) + +set_property(TARGET queued_message_router PROPERTY CXX_STANDARD 17) + diff --git a/examples/QueuedMessageRouter/vs2017/etl_profile.h b/examples/QueuedMessageRouter/etl_profile.h similarity index 91% rename from examples/QueuedMessageRouter/vs2017/etl_profile.h rename to examples/QueuedMessageRouter/etl_profile.h index c96719fd..9839404e 100644 --- a/examples/QueuedMessageRouter/vs2017/etl_profile.h +++ b/examples/QueuedMessageRouter/etl_profile.h @@ -33,12 +33,8 @@ SOFTWARE. #define ETL_THROW_EXCEPTIONS #define ETL_VERBOSE_ERRORS -#define ETL_CHECK_PUSH_POP -#define ETL_ISTRING_REPAIR_ENABLE -#define ETL_IVECTOR_REPAIR_ENABLE -#define ETL_IDEQUE_REPAIR_ENABLE -#ifdef _MSC_VER +#if defined(_MSC_VER) #include "etl/profiles/msvc_x86.h" #else #include "etl/profiles/gcc_windows_x86.h" diff --git a/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj b/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj index b697a59e..2c3eba2a 100644 --- a/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj +++ b/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj @@ -150,7 +150,7 @@ - + diff --git a/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj.filters b/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj.filters index ef62273b..795b7698 100644 --- a/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj.filters +++ b/examples/QueuedMessageRouter/vs2017/QueuedMessageRouter.vcxproj.filters @@ -20,7 +20,7 @@ - + Header Files diff --git a/include/etl/version.h b/include/etl/version.h index c3e84096..6817c770 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 17 #define ETL_VERSION_MINOR 1 -#define ETL_VERSION_PATCH 0 +#define ETL_VERSION_PATCH 1 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH) diff --git a/library.json b/library.json index 3a843aa5..67763b75 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Embedded Template Library", - "version": "17.1.0", + "version": "17.1.1", "authors": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index 7b91b37d..bd45ce5d 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=17.1.0 +version=17.1.1 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/support/Release notes.txt b/support/Release notes.txt index 0a722dad..71bfd88e 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +17.1.1 +Created CMakeLists.txt files for QueuedFSM and QueuedMessageRouter example projects. + =============================================================================== 17.1.0 Removed ETL's implementation of nullptr for pre C++11 compilers and created the macro