CMakeLists fixes

ThrowTheSwitch · Oct 26, 2019 · b75b19c · b75b19c
1 parent 53916f8
commit b75b19c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###################################################################################
 #                                                                                 #
-# NAME: CMakeLsits.txt                                                            #
+# NAME: CMakeLists.txt                                                            #
 #                                                                                 #
 # AUTHOR: Mike Karlesky, Mark VanderVoord, Greg Williams.                         #
 # WRITTEN BY: Michael Brockus.                                                    #
@@ -13,27 +13,18 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 project(unity LANGUAGES C DESCRIPTION "C Unit testing framework.")
 
-
-add_subdirectory("src")
-
-
-target_include_directories("unity" 
+add_subdirectory(src)
+target_include_directories(unity
     PUBLIC 
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
         "$<INSTALL_INTERFACE:src>"
 
     PRIVATE "src"
 )
 
-add_library("unity::framework" ALIAS "unity")
-
-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}")
+add_library(unity::framework ALIAS unity)
 
-install(DIRECTORY src/ DESTINATION src)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/ DESTINATION src)
 install(EXPORT unityConfig DESTINATION share/unityConfig/cmake)
 
 # This makes the project importable from the build directory

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,9 +8,15 @@
 # License: MIT                                                                    #
 #                                                                                 #
 ###################################################################################
-cmake_minimum_required(VERSION 3.13.2.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 
-add_library("unity" STATIC)
+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}")
+
 
-target_sources("unity" PRIVATE "unity.c")