cmake: update CMake

CMakeLists.txt

@@ -8,24 +8,108 @@
 # License: MIT                                                                    #
 #                                                                                 #
 ###################################################################################
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
-
+cmake_minimum_required(VERSION 3.12)
-project(unity LANGUAGES C DESCRIPTION "C Unit testing framework.")
+project(unity
-
+    VERSION     2.5.0
-add_subdirectory(src)
+    LANGUAGES   C
-target_include_directories(unity
+    DESCRIPTION "C Unit testing framework."
-    PUBLIC 
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
-        "$<INSTALL_INTERFACE:src>"
-
-    PRIVATE "src"
 )
 
-add_library(unity::framework ALIAS unity)
+# Main target ------------------------------------------------------------------
+add_library(${PROJECT_NAME} STATIC)
+add_library(${PROJECT_NAME}::framework ALIAS ${PROJECT_NAME})
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/ DESTINATION src)
+# Includes ---------------------------------------------------------------------
-install(EXPORT unityConfig DESTINATION share/unityConfig/cmake)
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
 
-# This makes the project importable from the build directory
+# Configuration ----------------------------------------------------------------
-export(TARGETS unity FILE unityConfig.cmake)
+configure_file(cmake/templates/${PROJECT_NAME}_version.h.in 
+               ${PROJECT_NAME}_version.h 
+               @ONLY
+)
+
+target_sources(${PROJECT_NAME}
+    PRIVATE
+        src/unity.c
+)
+
+target_include_directories(${PROJECT_NAME}
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>
+)
+
+set(${PROJECT_NAME}_PUBLIC_HEADERS src/unity.h
+                                   src/unity_internals.h
+                                   ${CMAKE_CURRENT_BINARY_DIR}/unity_version.h
+)
+
+set_target_properties(${PROJECT_NAME}
+    PROPERTIES 
+        C_STANDARD          11
+        C_STANDARD_REQUIRED ON
+        C_EXTENSIONS        OFF
+        PUBLIC_HEADER       "${${PROJECT_NAME}_PUBLIC_HEADERS}"
+        EXPORT_NAME         framework
+)
+
+target_compile_options(${PROJECT_NAME}
+    PRIVATE
+        $<$<C_COMPILER_ID:Clang>:-Wcast-align>
+        $<$<C_COMPILER_ID:Clang>:-Wcast-qual>
+        $<$<C_COMPILER_ID:Clang>:-Wconversion>
+        $<$<C_COMPILER_ID:Clang>:-Wexit-time-destructors>
+        $<$<C_COMPILER_ID:Clang>:-Wglobal-constructors>
+        $<$<C_COMPILER_ID:Clang>:-Wmissing-noreturn>
+        $<$<C_COMPILER_ID:Clang>:-Wmissing-prototypes>
+        $<$<C_COMPILER_ID:Clang>:-Wno-missing-braces>
+        $<$<C_COMPILER_ID:Clang>:-Wold-style-cast>
+        $<$<C_COMPILER_ID:Clang>:-Wshadow>
+        $<$<C_COMPILER_ID:Clang>:-Wweak-vtables>
+        $<$<C_COMPILER_ID:GNU>:-Waddress>
+        $<$<C_COMPILER_ID:GNU>:-Waggregate-return>
+        $<$<C_COMPILER_ID:GNU>:-Wformat-nonliteral>
+        $<$<C_COMPILER_ID:GNU>:-Wformat-security>
+        $<$<C_COMPILER_ID:GNU>:-Wformat>
+        $<$<C_COMPILER_ID:GNU>:-Winit-self>
+        $<$<C_COMPILER_ID:GNU>:-Wmissing-declarations>
+        $<$<C_COMPILER_ID:GNU>:-Wmissing-include-dirs>
+        $<$<C_COMPILER_ID:GNU>:-Wno-multichar>
+        $<$<C_COMPILER_ID:GNU>:-Wno-parentheses>
+        $<$<C_COMPILER_ID:GNU>:-Wno-type-limits>
+        $<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter>
+        $<$<C_COMPILER_ID:GNU>:-Wunreachable-code>
+        $<$<C_COMPILER_ID:GNU>:-Wwrite-strings>
+        -Wpointer-arith
+        -Wall
+        -Werror
+)
+
+write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
+    VERSION       ${PROJECT_VERSION}
+    COMPATIBILITY SameMajorVersion 
+)
+
+## Target installation
+install(TARGETS   ${PROJECT_NAME}
+    EXPORT        ${PROJECT_NAME}Targets
+    ARCHIVE       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+    COMPONENT     library
+)
+
+## Target's cmake files: targets export
+install(EXPORT  ${PROJECT_NAME}Targets
+    NAMESPACE   ${PROJECT_NAME}::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
+
+## Target's cmake files: config and version config for find_package()
+install(FILES   ${PROJECT_NAME}Config.cmake
+                ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)

cmake/templates/unity_version.h.in

@@ -0,0 +1,12 @@
+#ifndef UNITY_CONFIG_H
+#define UNITY_CONFIG_H
+
+#define UNITY_VERSION_STRING "@PROJECT_VERSION@"
+#define UNITY_VERSION_MAJOR  @PROJECT_VERSION_MAJOR@
+#define UNITY_VERSION_MINOR  @PROJECT_VERSION_MINOR@
+#define UNITY_VERSION_BUILD  @PROJECT_VERSION_PATCH@
+#define UNITY_VERSION        ((UNITY_VERSION_MAJOR << 16) | \
+                             (UNITY_VERSION_MINOR << 8) |   \
+                             UNITY_VERSION_BUILD)
+
+#endif /* UNITY_CONFIG_H */

src/CMakeLists.txt

@@ -1,22 +0,0 @@
-###################################################################################
-#                                                                                 #
-# NAME: CMakeLists.txt                                                            #
-#                                                                                 #
-# AUTHOR: Mike Karlesky, Mark VanderVoord, Greg Williams.                         #
-# WRITTEN BY: Michael Brockus.                                                    #
-#                                                                                 #
-# License: MIT                                                                    #
-#                                                                                 #
-###################################################################################
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-
-
-add_library(unity STATIC "unity.c")
-
-install(TARGETS unity EXPORT unityConfig
-    ARCHIVE  DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_LIBDIR}"
-    LIBRARY  DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_LIBDIR}"
-    RUNTIME  DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_BINDIR}"
-    INCLUDES DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-
-

src/unity.h

@@ -8,10 +8,7 @@
 #define UNITY_FRAMEWORK_H
 #define UNITY
 
-#define UNITY_VERSION_MAJOR    2
+#include "unity_version.h"
-#define UNITY_VERSION_MINOR    5
-#define UNITY_VERSION_BUILD    0
-#define UNITY_VERSION          ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD)
 
 #ifdef __cplusplus
 extern "C"

unityConfig.cmake

@@ -0,0 +1 @@
+include(${CMAKE_CURRENT_LIST_DIR}/unityTargets.cmake)