Merge pull request #60 from arduino-cmake/feature/lib-without-sources

Added ability to create libraries without sources

Author: MrPointer

.idea/codeStyles/Project.xml

@@ -0,0 +1,6 @@
+[
+    {
+        "name": "Arduino-CMake-Toolchain",
+        "toolchainFile": "${workspaceRoot}/cmake/Arduino-Toolchain.cmake"
+    }
+]

.vscode/cmake-kits.json

@@ -0,0 +1,15 @@
+{
+    "travis.repository": "Arduino-CMake-NG",
+    "travis.username": "arduino-cmake",
+    "travis.statusPollingInterval": 120,
+
+    "cmake.sourceDirectory": "${workspaceRoot}/examples",
+    "cmake.buildDirectory": "${workspaceRoot}/build/cmake-build-debug",
+    "cmake.preferredGenerators": [
+        "Ninja",
+        "Unix Makefiles",
+    ],
+    "cmake.configureOnOpen": true,
+    "C_Cpp.intelliSenseEngineFallback": "Enabled",
+    "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools"
+}

.vscode/settings.json

@@ -31,6 +31,10 @@ endfunction()
 #=============================================================================#
 function(resolve_library_architecture _library_sources _return_var)
 
+    if(NOT _library_sources)
+        return()
+    endif()
+
     cmake_parse_arguments(parsed_args "" "LIB_PROPS_FILE" "" ${ARGN})
 
     if (parsed_args_LIB_PROPS_FILE) # Library properties file is given

cmake/Platform/Libraries/LibrarySourcesArchitectureResolver.cmake

@@ -27,21 +27,29 @@ function(target_source_directories _target_name)
     list(REMOVE_DUPLICATES source_dirs)
 
     if (parsed_args_RECURSE) # Search recursively
+
         foreach (source_dir ${source_dirs})
+
             find_header_files(${source_dir} headers RECURSE)
             find_source_files(${source_dir} sources RECURSE)
 
             list(APPEND collective_headers ${headers})
             list(APPEND collective_sources ${sources})
+
         endforeach ()
+
     else ()
+    
         foreach (source_dir ${source_dirs})
+
             find_header_files(${source_dir} headers)
             find_source_files(${source_dir} sources)
 
             list(APPEND collective_headers ${headers})
             list(APPEND collective_sources ${sources})
+
         endforeach ()
+
     endif ()
 
     if (collective_headers)
@@ -54,6 +62,7 @@ function(target_source_directories _target_name)
 
     # Treat headers' parent directories as include directories of the target
     get_headers_parent_directories("${collective_headers}" include_dirs)
+    
     target_include_directories(${_target_name} PUBLIC ${include_dirs})
 
     target_sources(${_target_name} PUBLIC ${collective_sources})
@@ -73,6 +82,7 @@ function(get_source_file_includes _source_file _return_var)
     endif ()
 
     file(STRINGS "${_source_file}" source_lines)
+    
     list(FILTER source_lines INCLUDE REGEX "${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN}")
 
     set(${_return_var} ${source_lines} PARENT_SCOPE)
@@ -91,17 +101,22 @@ function(get_source_file_included_headers _source_file _return_var)
     cmake_parse_arguments(headers "WE" "" "" ${ARGN})
 
     file(STRINGS "${_source_file}" source_lines) # Loc = Lines of code
+    
     list(FILTER source_lines INCLUDE REGEX ${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN})
 
     # Extract header names from inclusion
     foreach (loc ${source_lines})
+        
         string(REGEX MATCH ${ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN} match ${loc})
+        
         if (headers_WE)
             get_name_without_file_extension("${CMAKE_MATCH_1}" header_name)
         else ()
             set(header_name ${CMAKE_MATCH_1})
         endif ()
+        
         list(APPEND headers ${header_name})
+    
     endforeach ()
 
     set(${_return_var} ${headers} PARENT_SCOPE)
@@ -119,10 +134,15 @@ function(get_headers_parent_directories _sources _return_var)
 
     # Extract header files
     list(FILTER _sources INCLUDE REGEX "${ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN}")
+    
     foreach (header_source ${_sources})
+
         get_filename_component(header_parent_dir ${header_source} DIRECTORY)
+        
         list(APPEND parent_dirs ${header_parent_dir})
+
     endforeach ()
+
     if (parent_dirs) # Check parent dirs, could be none if there aren't any headers amongst sources
         list(REMOVE_DUPLICATES parent_dirs)
     endif ()

cmake/Platform/Sources/SourcesManager.cmake

@@ -13,11 +13,15 @@ function(_add_arduino_cmake_library _target_name _board_id _sources)
     cmake_parse_arguments(parsed_args "INTERFACE" "" "" ${ARGN})
 
     if (parsed_args_INTERFACE)
+
         add_library(${_target_name} INTERFACE)
         set(scope INTERFACE)
+    
     else ()
-        add_library(${_target_name} STATIC "${_sources}")
+    
+        add_library(${_target_name} STATIC "${_sources}")   
         set(scope PUBLIC)
+    
     endif ()
 
     # Treat headers' parent directories as include directories of the target
@@ -26,8 +30,7 @@ function(_add_arduino_cmake_library _target_name _board_id _sources)
 
     set_library_flags(${_target_name} ${_board_id} ${scope})
 
-    set_target_architecture_definition(${_target_name} ${scope}
-            ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE})
+    set_target_architecture_definition(${_target_name} ${scope} ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE})
 
 endfunction()
 

cmake/Platform/Targets/ArduinoCMakeLibraryTarget.cmake

@@ -10,18 +10,26 @@ function(add_arduino_library _target_name _board_id)
 
     parse_sources_arguments(parsed_sources "" "" "" "${ARGN}")
 
-    get_sources_root_directory("${parsed_sources}" library_root_dir)
+    if (parsed_sources)
 
-    get_library_properties_file(${library_root_dir} library_properties_file)
+        get_sources_root_directory("${parsed_sources}" library_root_dir)
 
-    if (library_properties_file) # Properties file has been found
-        resolve_library_architecture("${parsed_sources}" arch_resolved_sources
-                LIB_PROPS_FILE ${library_properties_file})
-    else ()
-        resolve_library_architecture("${parsed_sources}" arch_resolved_sources)
-    endif ()
+        get_library_properties_file(${library_root_dir} library_properties_file)
+
+        if (library_properties_file) # Properties file has been found
+            resolve_library_architecture("${parsed_sources}" arch_resolved_sources
+                    LIB_PROPS_FILE ${library_properties_file})
+        else ()
+            resolve_library_architecture("${parsed_sources}" arch_resolved_sources)
+        endif ()
+
+        _add_arduino_cmake_library(${_target_name} ${_board_id} "${arch_resolved_sources}")
+
+    else() # No sources have been provided at this stage, simply create a library target
 
-    _add_arduino_cmake_library(${_target_name} ${_board_id} "${arch_resolved_sources}")
+        _add_arduino_cmake_library(${_target_name} ${_board_id} "")
+    
+    endif()
 
     find_dependent_platform_libraries("${arch_resolved_sources}" lib_platform_libs)
 

cmake/Platform/Targets/ArduinoLibraryTarget.cmake

@@ -11,9 +11,14 @@
 #=============================================================================#
 function(_consume_reserved_arguments _args _reserved_options _reserved_single_values _return_var)
 
+    if("${_args}" STREQUAL "") # Check if there are any arguments at all
+        return()
+    endif()
+    
     set(temp_arg_list ${_args})
 
     list(LENGTH _args args_length)
+    
     decrement_integer(args_length 1) # We'll peform index iteration - It's always length-1
 
     foreach (index RANGE ${args_length})

cmake/Platform/Utilities/CMakeArgumentsUtils.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.8.2)
 
 project(Examples LANGUAGES C CXX ASM)
 
@@ -9,3 +9,4 @@ add_subdirectory(header-only-library)
 add_subdirectory(blink-example)
 add_subdirectory(servo-knob-example)
 add_subdirectory(sketch)
+add_subdirectory(misc)

examples/CMakeLists.txt

@@ -7,8 +7,8 @@ void setup()
 
 void loop()
 {
-    digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
-    delay(1000);                       // wait for a second
-    digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
-    delay(1000);                       // wait for a second
+    digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level)
+    delay(1000);                     // wait for a second
+    digitalWrite(LED_BUILTIN, LOW);  // turn the LED off by making the voltage LOW
+    delay(1000);                     // wait for a second
 }