Refactor build system

.vscode/cmake-variants.TEMPLATE.json

@@ -40,7 +40,7 @@
           "USE_RNG": "<ON-default-for-using-hardware-true-random-generator-unit>",
           "DP_FLOATINGPOINT": "<OFF-default-ON-for-adding-support-for-double-precision-floating-point>",
           "SUPPORT_ANY_BASE_CONVERSION": "<OFF-default-ON-for-adding-support-for-conversion-strings-to-values-on-any-base>",
-          "RTOS": "<one-of-valid-rtos-options-CHIBIOS-FREERTOS-FREERTOS_ESP32-TI_SIMPLELINK>",
+          "RTOS": "<one-of-valid-rtos-options-ChibiOS-FreeRTOS-FreeRTOS_ESP32-TI_SIMPLELINK>",
           "RTOS_SOURCE_FOLDER": "<path-to-RTOS-source-folder-if-supported-mind-the-forward-slash>",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF-default-ON-to-include_ChibiOS-Contrib-repository-in-the-build",
           "CHIBIOS_CONTRIB_SOURCE": "<path-to-local-ChibiOS-contrib-source-mind-the-forward-slash>",
@@ -50,8 +50,8 @@
           "CMSIS_VERSION": "<valid-cmsis-version-if-empty-use-default-set-cmake>",
           "STM32_CUBE_PACKAGE_REQUIRED": "<OFF-default-ON-to-include_STM-cube-package-in-the-build>",
           "STM32_CUBE_PACKAGE_SOURCE": "<path-to-stm32-cubemx-package-mind-the-forward-slash>",
-          "TI_SL_CC32xx_SDK_SOURCE": "<path-to-local-TI-SimpleLink-CC32xx-SDK-source-mind-the-forward-slash>",
-          "TI_SL_CC13x2_26x2_SDK_SOURCE": "<path-to-local-TI-SimpleLink-CC13x2_26x2-SDK-source-mind-the-forward-slash>",
+          "TI_SL_CC32xx_SDK_SOURCE": "<path-to-local-TI_SimpleLink-CC32xx-SDK-source-mind-the-forward-slash>",
+          "TI_SL_CC13x2_26x2_SDK_SOURCE": "<path-to-local-TI_SimpleLink-CC13x2_26x2-SDK-source-mind-the-forward-slash>",
           "TI_XDCTOOLS_SOURCE": "<path-to-local-TI-XDC-Tools-source-mind-the-forward-slash>",
           "TI_SYSCONFIG_SOURCE": "<path-to-local-TI-SYSCONFIG-Tool-source-mind-the-forward-slash>",
           "RADIO_FREQUENCY": "<radio-frequency-for-target-with-configurable-radio-valid-values-868-915>",

CMake/ChibiOS_target_os.h.in

@@ -10,8 +10,8 @@
 
 #include <chversion.h>
 
-#ifndef _TARGET_OS_H_
-#define _TARGET_OS_H_ 1
+#ifndef TARGET_OS_H
+#define TARGET_OS_H
 
 #define STR_HELPER(x) #x
 #define STR(x)        STR_HELPER(x)
@@ -31,4 +31,4 @@
 #define NANOCLR_SYSTEM_COLLECTIONS  @TARGET_SYSTEM_COLLECTIONS@
 #define TARGET_HAS_NANOBOOTER       @TARGET_HAS_NANOBOOTER@
 
-#endif /* _TARGET_OS_H_ */
+#endif // TARGET_OS_H

CMake/ESP32_target_os.h.in

@@ -8,8 +8,8 @@
 // Any changes you make here will be overwritten when it's generated again. //
 //////////////////////////////////////////////////////////////////////////////
 
-#ifndef _TARGET_OS_H_
-#define _TARGET_OS_H_ 1
+#ifndef TARGET_OS_H
+#define TARGET_OS_H
 
 #define VERSION_MAJOR    @nanoFramework_VERSION_MAJOR@U
 #define VERSION_MINOR    @nanoFramework_VERSION_MINOR@U
@@ -27,4 +27,4 @@
 #define TARGET_HAS_NANOBOOTER       FALSE
 #cmakedefine TARGET_SERIAL_BAUDRATE      @TARGET_SERIAL_BAUDRATE@
 
-#endif /* _TARGET_OS_H_ */
+#endif // TARGET_OS_H

CMake/FreeRTOS_target_os.h.in

@@ -8,8 +8,8 @@
 // Any changes you make here will be overwritten when it's generated again. //
 //////////////////////////////////////////////////////////////////////////////
 
-#ifndef _TARGET_OS_H_
-#define _TARGET_OS_H_ 1
+#ifndef TARGET_OS_H
+#define TARGET_OS_H
 
 #define STR_HELPER(x) #x
 #define STR(x)        STR_HELPER(x)
@@ -29,4 +29,4 @@
 #define NANOCLR_SYSTEM_COLLECTIONS      @TARGET_SYSTEM_COLLECTIONS@
 #define TARGET_HAS_NANOBOOTER           @TARGET_HAS_NANOBOOTER@
 
-#endif /* _TARGET_OS_H_ */
+#endif // TARGET_OS_H

CMake/Modules/CHIBIOS_STM32F0xx_GCC_options.cmake

@@ -14,34 +14,52 @@ set(CMAKE_ASM_FLAGS " -mthumb -mcpu=cortex-m0 -mfloat-abi=soft -mabi=aapcs -x as
 set(CMAKE_EXE_LINKER_FLAGS " -Wl,--gc-sections -Wl,--no-wchar-size-warning -Wl,--print-memory-usage -mthumb -mcpu=cortex-m0 -mfloat-abi=soft -mabi=aapcs -nostartfiles " CACHE INTERNAL "executable linker flags")
 
 
-function(NF_SET_COMPILER_OPTIONS TARGET)
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_COMPILE_OPTIONS with compile options to be added
+macro(nf_set_compile_options)
+
+    # parse arguments
+    cmake_parse_arguments(NFSCO "" "TARGET" "EXTRA_COMPILE_OPTIONS" ${ARGN})
+
+    if(NOT NFSCO_TARGET OR "${NFSCO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_compile_options()")
+    endif()
 
     # include any extra options coming from any extra args?
-    target_compile_options(${TARGET} PUBLIC  ${ARGN} -mthumb -mcpu=cortex-m0 -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
+    target_compile_options(${NFSCO_TARGET} PUBLIC  ${NFSCO_EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m0 -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
 
     # this series doesn't have FPU 
-    target_compile_definitions(${TARGET} PUBLIC -DCORTEX_USE_FPU=FALSE -DUSE_FPU=TRUE)
+    target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=FALSE -DUSE_FPU=TRUE)
 
-endfunction()
+endmacro()
 
 
-function(NF_SET_LINKER_OPTIONS TARGET)
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_LINK_FLAGS with link flags to be added
+macro(nf_set_linker_options)
 
-    # request specs from newlib nano
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+    # parse arguments
+    cmake_parse_arguments(NFSLO "" "TARGET;EXTRA_LINK_FLAGS" "" ${ARGN})
+
+    if(NOT NFSLO_TARGET OR "${NFSLO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_linker_options()")
+    endif()
 
-    # set extra linker flags
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${ARGN}")
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
 
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
 
+    # include libraries in build
+    nf_include_libraries_in_build(${NFSLO_TARGET})
+
+    # set extra linker flags
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO_EXTRA_LINK_FLAGS} ")
+
     # set optimization flags
-    nf_set_optimization_options(${TARGET})
-
-    # set link map
-    nf_set_link_map(${TARGET})
+    nf_set_optimization_options(${NFSLO_TARGET})
 
-endfunction()
+endmacro()

CMake/Modules/CHIBIOS_STM32F4xx_GCC_options.cmake

@@ -14,34 +14,53 @@ set(CMAKE_ASM_FLAGS " -mthumb -mcpu=cortex-m4 -x assembler-with-cpp" CACHE INTER
 set(CMAKE_EXE_LINKER_FLAGS " -Wl,--gc-sections -Wl,--no-wchar-size-warning -Wl,--print-memory-usage -mthumb -mcpu=cortex-m4 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostartfiles " CACHE INTERNAL "executable linker flags")
 
 
-function(NF_SET_COMPILER_OPTIONS TARGET)
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_COMPILE_OPTIONS with compile options to be added
+macro(nf_set_compile_options)
+
+    # parse arguments
+    cmake_parse_arguments(NFSCO "" "TARGET" "EXTRA_COMPILE_OPTIONS" ${ARGN})
+
+    if(NOT NFSCO_TARGET OR "${NFSCO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_compile_options()")
+    endif()
+
 
     # include any extra options coming from any extra args?
-    target_compile_options(${TARGET} PUBLIC  ${ARGN} -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
+    target_compile_options(${NFSCO_TARGET} PUBLIC  ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
 
     # this series has FPU 
-    target_compile_definitions(${TARGET} PUBLIC -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
+    target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
 
-endfunction()
+endmacro()
 
 
-function(NF_SET_LINKER_OPTIONS TARGET)
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_LINK_FLAGS with link flags to be added
+macro(nf_set_linker_options)
 
-    # request specs from newlib nano
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+    # parse arguments
+    cmake_parse_arguments(NFSLO "" "TARGET;EXTRA_LINK_FLAGS" "" ${ARGN})
+
+    if(NOT NFSLO_TARGET OR "${NFSLO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_linker_options()")
+    endif()
 
-    # set extra linker flags
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${ARGN}")
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
 
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
+
+    # include libraries in build
+    nf_include_libraries_in_build(${NFSLO_TARGET})
+
+    # set extra linker flags
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
 
     # set optimization flags
-    nf_set_optimization_options(${TARGET})
-
-    # set link map
-    nf_set_link_map(${TARGET})
-
-endfunction()
+    nf_set_optimization_options(${NFSLO_TARGET})
+
+endmacro()

CMake/Modules/CHIBIOS_STM32F7xx_GCC_options.cmake

@@ -14,35 +14,52 @@ set(CMAKE_ASM_FLAGS " -mthumb -mcpu=cortex-m7 -x assembler-with-cpp" CACHE INTER
 set(CMAKE_EXE_LINKER_FLAGS " -Wl,--gc-sections -Wl,--no-wchar-size-warning -Wl,--print-memory-usage -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostartfiles " CACHE INTERNAL "executable linker flags")
 
 
-function(NF_SET_COMPILER_OPTIONS TARGET)
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_COMPILE_OPTIONS with compile options to be added
+macro(nf_set_compile_options)
+
+    # parse arguments
+    cmake_parse_arguments(NFSCO "" "TARGET" "EXTRA_COMPILE_OPTIONS" ${ARGN})
+
+    if(NOT NFSCO_TARGET OR "${NFSCO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_compile_options()")
+    endif()
 
     # include any extra options coming from any extra args?
     # STMF7 cores have SP and DP, the default is SP. DP can be set if developer realy needs that.
-    target_compile_options(${TARGET} PUBLIC  ${ARGN} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
+    target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
 
     # this series has FPU 
-    target_compile_definitions(${TARGET} PUBLIC -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
+    target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
 
-endfunction()
+endmacro()
 
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_LINK_FLAGS with link flags to be added
+macro(nf_set_linker_options)
 
-function(NF_SET_LINKER_OPTIONS TARGET)
+    # parse arguments
+    cmake_parse_arguments(NFSLO "" "TARGET;EXTRA_LINK_FLAGS" "" ${ARGN})
 
-    # request specs from newlib nano
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+    if(NOT NFSLO_TARGET OR "${NFSLO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_linker_options()")
+    endif()
 
-    # set extra linker flags
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${ARGN}")
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
 
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
+
+    # include libraries in build
+    nf_include_libraries_in_build(${NFSLO_TARGET})
+
+    # set extra linker flags
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
 
     # set optimization flags
-    nf_set_optimization_options(${TARGET})
-
-    # set link map
-    nf_set_link_map(${TARGET})
+    nf_set_optimization_options(${NFSLO_TARGET})
 
-endfunction()
+endmacro()

CMake/Modules/CHIBIOS_STM32H7xx_GCC_options.cmake

@@ -14,35 +14,54 @@ set(CMAKE_ASM_FLAGS " -mthumb -mcpu=cortex-m7 -x assembler-with-cpp" CACHE INTER
 set(CMAKE_EXE_LINKER_FLAGS " -Wl,--gc-sections -Wl,--no-wchar-size-warning -Wl,--print-memory-usage -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostartfiles " CACHE INTERNAL "executable linker flags")
 
 
-function(NF_SET_COMPILER_OPTIONS TARGET)
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_COMPILE_OPTIONS with compile options to be added
+macro(nf_set_compile_options)
+
+    # parse arguments
+    cmake_parse_arguments(NFSCO "" "TARGET" "EXTRA_COMPILE_OPTIONS" ${ARGN})
+
+    if(NOT NFSCO_TARGET OR "${NFSCO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_compile_options()")
+    endif()
+
 
     # include any extra options coming from any extra args?
     # STMF7 cores have SP and DP, the default is SP. DP can be set if developer realy needs that.
-    target_compile_options(${TARGET} PUBLIC  ${ARGN} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
+    target_compile_options(${NFSCO_TARGET} PUBLIC  ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
 
     # this series has FPU 
-    target_compile_definitions(${TARGET} PUBLIC -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
+    target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
 
-endfunction()
+endmacro()
 
 
-function(NF_SET_LINKER_OPTIONS TARGET)
+# TARGET parameter to set the target that's setting them for
+# optional EXTRA_LINK_FLAGS with link flags to be added
+macro(nf_set_linker_options)
 
-    # request specs from newlib nano
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+    # parse arguments
+    cmake_parse_arguments(NFSLO "" "TARGET;EXTRA_LINK_FLAGS" "" ${ARGN})
+
+    if(NOT NFSLO_TARGET OR "${NFSLO_TARGET}" STREQUAL "")
+        message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_linker_options()")
+    endif()
 
-    # set extra linker flags
-    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${ARGN}")
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
 
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -flto -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
+
+    # include libraries in build
+    nf_include_libraries_in_build(${NFSLO_TARGET})
+
+    # set extra linker flags
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
 
     # set optimization flags
-    nf_set_optimization_options(${TARGET})
-
-    # set link map
-    nf_set_link_map(${TARGET})
+    nf_set_optimization_options(${NFSLO_TARGET})
 
-endfunction()
+endmacro()