dengzhihao
/
CMSIS-DSP
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMSIS-DSP: Simplification to cmake to build without test framework.

Browse Source
pull/19/head
Christophe Favergeon 6 years ago
parent 5309ff3334
commit 84c7261036
20 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File

14
Include/arm_math.h
Unescape Escape View File

@ -360,12 +360,14 @@ extern "C"
#if defined (_MSC_VER ) #if defined (_MSC_VER )
#include <stdint.h> #include <stdint.h>
#define __STATIC_FORCEINLINE static __forceinline #define __STATIC_FORCEINLINE static __forceinline
#define __STATIC_INLINE static __inline
#define __ALIGNED(x) __declspec(align(x)) #define __ALIGNED(x) __declspec(align(x))
#elif defined (__GNUC_PYTHON__) #elif defined (__GNUC_PYTHON__)
#include <stdint.h> #include <stdint.h>
#define __ALIGNED(x) __attribute__((aligned(x))) #define __ALIGNED(x) __attribute__((aligned(x)))
#define __STATIC_FORCEINLINE static __attribute__((inline)) #define __STATIC_FORCEINLINE static __attribute__((inline))
#define __STATIC_INLINE static __attribute__((inline))
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wattributes" #pragma GCC diagnostic ignored "-Wattributes"
@ -7976,11 +7978,6 @@ float32_t arm_yule_distance(const uint32_t *pA, const uint32_t *pB, uint32_t num
#if defined ( __ARM_ARCH_7EM__ ) #if defined ( __ARM_ARCH_7EM__ )
#define LOW_OPTIMIZATION_ENTER \ #define LOW_OPTIMIZATION_ENTER \
_Pragma ("optimize=low") _Pragma ("optimize=low")
#elif defined ( _MSC_VER)
#define LOW_OPTIMIZATION_ENTER
#define LOW_OPTIMIZATION_EXIT
#define IAR_ONLY_LOW_OPTIMIZATION_ENTER
#define IAR_ONLY_LOW_OPTIMIZATION_EXIT
#else #else
#define LOW_OPTIMIZATION_ENTER #define LOW_OPTIMIZATION_ENTER
#endif #endif
@ -8016,7 +8013,12 @@ float32_t arm_yule_distance(const uint32_t *pA, const uint32_t *pB, uint32_t num
#define LOW_OPTIMIZATION_EXIT #define LOW_OPTIMIZATION_EXIT
#define IAR_ONLY_LOW_OPTIMIZATION_ENTER #define IAR_ONLY_LOW_OPTIMIZATION_ENTER
#define IAR_ONLY_LOW_OPTIMIZATION_EXIT #define IAR_ONLY_LOW_OPTIMIZATION_EXIT
#elif defined ( _MSC_VER ) || (__GNUC_PYTHON__)
#define LOW_OPTIMIZATION_ENTER
#define LOW_OPTIMIZATION_EXIT
#define IAR_ONLY_LOW_OPTIMIZATION_ENTER
#define IAR_ONLY_LOW_OPTIMIZATION_EXIT
#endif #endif

2
Source/BasicMathFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPBasicMath) project(CMSISDSPBasicMath)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/BayesFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPBayes) project(CMSISDSPBayes)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/CMakeLists.txt
Unescape Escape View File

@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH ${DSP}/Source)
list(APPEND CMAKE_MODULE_PATH ${DSP}) list(APPEND CMAKE_MODULE_PATH ${DSP})
include(config) include(configLib)
option(NEON "Neon acceleration" OFF) option(NEON "Neon acceleration" OFF)

2
Source/CommonTables/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPCommon) project(CMSISDSPCommon)
include(config) include(configLib)
include(configDsp) include(configDsp)
add_library(CMSISDSPCommon STATIC arm_common_tables.c) add_library(CMSISDSPCommon STATIC arm_common_tables.c)

2
Source/ComplexMathFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPComplexMath) project(CMSISDSPComplexMath)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/ControllerFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPController) project(CMSISDSPController)
include(config) include(configLib)
include(configDsp) include(configDsp)
add_library(CMSISDSPController STATIC) add_library(CMSISDSPController STATIC)

2
Source/DistanceFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPDistance) project(CMSISDSPDistance)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/FastMathFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPFastMath) project(CMSISDSPFastMath)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/FilteringFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPFiltering) project(CMSISDSPFiltering)
include(config) include(configLib)
include(configDsp) include(configDsp)
add_library(CMSISDSPFiltering STATIC) add_library(CMSISDSPFiltering STATIC)

2
Source/MatrixFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPMatrix) project(CMSISDSPMatrix)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/SVMFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPSVM) project(CMSISDSPSVM)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/StatisticsFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPStatistics) project(CMSISDSPStatistics)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/SupportFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPSupport) project(CMSISDSPSupport)
include(config) include(configLib)
include(configDsp) include(configDsp)
file(GLOB SRC "./*_*.c") file(GLOB SRC "./*_*.c")

2
Source/TransformFunctions/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6)
project(CMSISDSPTransform) project(CMSISDSPTransform)
include(config) include(configLib)
include(configDsp) include(configDsp)
add_library(CMSISDSPTransform STATIC) add_library(CMSISDSPTransform STATIC)

0
fft.cmake → Source/fft.cmake
Unescape Escape View File

0
interpol.cmake → Source/interpol.cmake
Unescape Escape View File

11
config.cmake
Unescape Escape View File

@ -3,12 +3,11 @@ list(APPEND CMAKE_MODULE_PATH ${EXPROOT})
include(experimental) include(experimental)
endif() endif()
include(Toolchain/Tools)
include(configLib)
SET(PLATFORMFOLDER ${ROOT}/CMSIS/DSP/Platforms/FVP) SET(PLATFORMFOLDER ${ROOT}/CMSIS/DSP/Platforms/FVP)
option(OPTIMIZED "Compile for speed" ON)
include(configPlatform) include(configPlatform)
include(configBoot) include(configBoot)
include(configCore)
define_property(TARGET define_property(TARGET
PROPERTY DISABLEOPTIMIZATION PROPERTY DISABLEOPTIMIZATION
@ -23,12 +22,6 @@ function(disableOptimization project)
endfunction() endfunction()
function(configLib project cmsisRoot)
configcore(${project} ${cmsisRoot})
configplatformForLib(${project} ${cmsisRoot})
SET(COREID ${COREID} PARENT_SCOPE)
endfunction()
# Config app # Config app
function (configApp project cmsisRoot) function (configApp project cmsisRoot)
configcore(${project} ${cmsisRoot}) configcore(${project} ${cmsisRoot})

8
configBoot.cmake
Unescape Escape View File

@ -1,13 +1,5 @@
include(CMakePrintHelpers) include(CMakePrintHelpers)
enable_language(CXX C ASM)
# Otherwise there is a .obj on windows and it creates problems
# with armlink.
SET(CMAKE_C_OUTPUT_EXTENSION .o)
SET(CMAKE_CXX_OUTPUT_EXTENSION .o)
SET(CMAKE_ASM_OUTPUT_EXTENSION .o)
get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)

26
configLib.cmake
Unescape Escape View File

@ -0,0 +1,26 @@
# This is for building a library only
# It is similar to the config.cmake but ignoring anything related to the platform
# and boot code
include(Toolchain/Tools)
option(OPTIMIZED "Compile for speed" ON)
enable_language(CXX C ASM)
# Otherwise there is a .obj on windows and it creates problems
# with armlink.
SET(CMAKE_C_OUTPUT_EXTENSION .o)
SET(CMAKE_CXX_OUTPUT_EXTENSION .o)
SET(CMAKE_ASM_OUTPUT_EXTENSION .o)
include(configCore)
function(configLib project cmsisRoot)
configcore(${project} ${cmsisRoot})
#configplatformForLib(${project} ${cmsisRoot})
SET(COREID ${COREID} PARENT_SCOPE)
endfunction()
Write Preview
Loading…
Cancel
Save