Library template updated

ConstantRobotics-Ltd · Aug 6, 2024 · 04f722a · 04f722a
1 parent 9b19867
commit 04f722a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10 deletions.
diff --git a/CodingStandards_v1.0.1.pdf b/CodingStandards_v1.0.1.pdf
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # **Coding Standards**
 
-**v1.0.1**
+**v1.1.0**
 
 
 
@@ -41,7 +41,8 @@ This is ConstantRobotics' Coding Standards document. This guide outlines essenti
 | Version | Release date | What's new                                                   |
 | ------- | ------------ | ------------------------------------------------------------ |
 | 1.0.0   | 04.01.2024   | First version of standards, which includes:<br />- Style guide.<br />- Memory management guide.<br />- Templates for library and application with documentation guide.<br />- List of resources. |
-| 1.0.1   | 17.05.2024   | Documentation and structure updated. |
+| 1.0.1   | 17.05.2024   | - Documentation and structure updated.                       |
+| 1.1.0   | 06.08.2024   | - Library template updated.                                  |
 
 
 

diff --git a/templates/TemplateApplication/3rdparty/ConfigReader b/templates/TemplateApplication/3rdparty/ConfigReader
diff --git a/templates/TemplateApplication/TemplateApplication_manual_v1.0.1.pdf b/templates/TemplateApplication/TemplateApplication_manual_v1.0.1.pdf
diff --git a/templates/TemplateLibrary/3rdparty/ConfigReader b/templates/TemplateLibrary/3rdparty/ConfigReader
diff --git a/templates/TemplateLibrary/CMakeLists.txt b/templates/TemplateLibrary/CMakeLists.txt
@@ -23,16 +23,29 @@ else()
     SET(REWRITE_FORCE "")
 endif()
 
+# Set default Release mode if not specified
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type defaulting to Release" FORCE)
+endif()
+
 
 
 ################################################################################
 ## CONFIGURATION
 ## project configuration
 ################################################################################
 SET(${PARENT}_TEMPLATE_LIBRARY               ON  CACHE BOOL "" ${REWRITE_FORCE})
-SET(${PARENT}_TEMPLATE_LIBRARY_DEMO          ON  CACHE BOOL "" ${REWRITE_FORCE})
-SET(${PARENT}_TEMPLATE_LIBRARY_TEST          ON  CACHE BOOL "" ${REWRITE_FORCE})
-SET(${PARENT}_TEMPLATE_LIBRARY_EXAMPLE       ON  CACHE BOOL "" ${REWRITE_FORCE})
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+    SET(${PARENT}_TEMPLATE_LIBRARY_DEMO      OFF CACHE BOOL "" ${REWRITE_FORCE})
+    SET(${PARENT}_TEMPLATE_LIBRARY_TEST      OFF CACHE BOOL "" ${REWRITE_FORCE})
+    SET(${PARENT}_TEMPLATE_LIBRARY_EXAMPLE   OFF CACHE BOOL "" ${REWRITE_FORCE})
+    message("${PROJECT_NAME} included as subrepository.")
+else()
+    SET(${PARENT}_TEMPLATE_LIBRARY_DEMO      ON  CACHE BOOL "" ${REWRITE_FORCE})
+    SET(${PARENT}_TEMPLATE_LIBRARY_TEST      ON  CACHE BOOL "" ${REWRITE_FORCE})
+    SET(${PARENT}_TEMPLATE_LIBRARY_EXAMPLE   ON  CACHE BOOL "" ${REWRITE_FORCE})
+    message("${PROJECT_NAME} is a standalone project.")
+endif()
 
 
 

diff --git a/templates/TemplateLibrary/TemplateLibrary_v1.0.1.pdf b/templates/TemplateLibrary/TemplateLibrary_v1.0.1.pdf
diff --git a/templates/TemplateLibrary/src/CMakeLists.txt b/templates/TemplateLibrary/src/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13)
 ## INTERFACE-PROJECT
 ## name and version
 ###############################################################################
-project(TemplateLibrary VERSION 1.0.0 LANGUAGES CXX)
+project(TemplateLibrary VERSION 1.0.1 LANGUAGES CXX)
 
 
 

diff --git a/templates/TemplateLibrary/src/TemplateLibraryVersion.h b/templates/TemplateLibrary/src/TemplateLibraryVersion.h
@@ -2,6 +2,6 @@
 
 #define TEMPLATE_LIBRARY_MAJOR_VERSION 1
 #define TEMPLATE_LIBRARY_MINOR_VERSION 0
-#define TEMPLATE_LIBRARY_PATCH_VERSION 0
+#define TEMPLATE_LIBRARY_PATCH_VERSION 1
 
-#define TEMPLATE_LIBRARY_VERSION "1.0.0"
+#define TEMPLATE_LIBRARY_VERSION "1.0.1"