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

CMSIS-DSP: Changed cmake required minimum version

Browse Source
pull/19/head
Christophe Favergeon 6 years ago
parent 2f270b6e5f
commit c0d3b61f37
31 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
DSP_Lib_TestSuite/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
cmake_policy(SET CMP0077 NEW) cmake_policy(SET CMP0077 NEW)
# The tests are assuming that MATRIX_CHECK is enabled when building # The tests are assuming that MATRIX_CHECK is enabled when building
# CMSIS-DSP. # CMSIS-DSP.

2
DSP_Lib_TestSuite/RefLibs/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(DspRefLibs) project(DspRefLibs)

2
Examples/ARM/arm_bayes_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_bayes_example VERSION 0.1) project (arm_bayes_example VERSION 0.1)

2
Examples/ARM/arm_class_marks_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_class_marks_example VERSION 0.1) project (arm_class_marks_example VERSION 0.1)

2
Examples/ARM/arm_convolution_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_convolution_example VERSION 0.1) project (arm_convolution_example VERSION 0.1)

2
Examples/ARM/arm_dotproduct_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_dotproduct_example VERSION 0.1) project (arm_dotproduct_example VERSION 0.1)

2
Examples/ARM/arm_fft_bin_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_fft_bin_example VERSION 0.1) project (arm_fft_bin_example VERSION 0.1)

2
Examples/ARM/arm_fir_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_fir_example VERSION 0.1) project (arm_fir_example VERSION 0.1)

2
Examples/ARM/arm_graphic_equalizer_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_graphic_equalizer_example VERSION 0.1) project (arm_graphic_equalizer_example VERSION 0.1)

2
Examples/ARM/arm_linear_interp_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_linear_interp_example VERSION 0.1) project (arm_linear_interp_example VERSION 0.1)

2
Examples/ARM/arm_matrix_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_matrix_example VERSION 0.1) project (arm_matrix_example VERSION 0.1)

2
Examples/ARM/arm_signal_converge_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_signal_convergence_example VERSION 0.1) project (arm_signal_convergence_example VERSION 0.1)

2
Examples/ARM/arm_sin_cos_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_sin_cos_example VERSION 0.1) project (arm_sin_cos_example VERSION 0.1)

2
Examples/ARM/arm_svm_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_svm_example VERSION 0.1) project (arm_svm_example VERSION 0.1)

2
Examples/ARM/arm_variance_example/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project (arm_variance_example VERSION 0.1) project (arm_variance_example VERSION 0.1)

2
README.md
Unescape Escape View File

@ -71,7 +71,7 @@ Create a folder BuildCMSISOnly.
Inside the folder, create a CMakeLists.txt with the following content: Inside the folder, create a CMakeLists.txt with the following content:
```cmake ```cmake
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
# Define the project # Define the project
project (testcmsisdsp VERSION 0.1) project (testcmsisdsp VERSION 0.1)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPBasicMath) project(CMSISDSPBasicMath)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPBayes) project(CMSISDSPBayes)

2
Source/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
cmake_policy(SET CMP0077 NEW) cmake_policy(SET CMP0077 NEW)
project(CMSISDSP) project(CMSISDSP)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPCommon) project(CMSISDSPCommon)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPComplexMath) project(CMSISDSPComplexMath)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPController) project(CMSISDSPController)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPDistance) project(CMSISDSPDistance)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPFastMath) project(CMSISDSPFastMath)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPFiltering) project(CMSISDSPFiltering)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPMatrix) project(CMSISDSPMatrix)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPSVM) project(CMSISDSPSVM)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPStatistics) project(CMSISDSPStatistics)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPSupport) project(CMSISDSPSupport)

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

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
project(CMSISDSPTransform) project(CMSISDSPTransform)

24
Testing/CMakeLists.txt
Unescape Escape View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.6) cmake_minimum_required (VERSION 3.14)
cmake_policy(SET CMP0077 NEW) cmake_policy(SET CMP0077 NEW)
include(CMakePrintHelpers) include(CMakePrintHelpers)
@ -82,7 +82,7 @@ option(EMBEDDED "Embedded Mode" ON)
option(FLOAT16TESTS "Float16 tests" OFF) option(FLOAT16TESTS "Float16 tests" OFF)
option(MICROBENCH "Micro benchmarks" OFF) option(MICROBENCH "Micro benchmarks" OFF)
option(EXTERNALBENCH "External benchmarks" OFF) option(EXTERNAL "External benchmarks or tests" OFF)
project(Testing) project(Testing)
@ -98,7 +98,7 @@ set(ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(TESTFRAMEWORK ON) set(TESTFRAMEWORK ON)
include(config) include(config)
if (NOT REFLIB) if ((NOT REFLIB) AND (NOT NOCMSIS))
add_subdirectory(../Source bin_dsp) add_subdirectory(../Source bin_dsp)
endif() endif()
@ -124,7 +124,7 @@ if (MICROBENCH)
endif() endif()
if (EXTERNALBENCH) if (EXTERNAL)
add_subdirectory(${EXTERNALDIR} bin_external) add_subdirectory(${EXTERNALDIR} bin_external)
set(STANDARDBENCH OFF) set(STANDARDBENCH OFF)
endif() endif()
@ -182,6 +182,8 @@ set (NNSRC
else() else()
set(STANDARDTEST ON)
set(NNSRC set(NNSRC
Source/Tests/NNSupport.cpp Source/Tests/NNSupport.cpp
Source/Tests/Pooling.cpp Source/Tests/Pooling.cpp
@ -189,6 +191,12 @@ set(NNSRC
Source/Tests/FullyConnected.cpp Source/Tests/FullyConnected.cpp
) )
if (EXTERNAL)
add_subdirectory(${EXTERNALDIR} bin_external)
set(STANDARDTEST OFF)
endif()
if (STANDARDTEST)
set(TESTSRC set(TESTSRC
Source/Tests/BasicTestsF32.cpp Source/Tests/BasicTestsF32.cpp
Source/Tests/BasicTestsQ31.cpp Source/Tests/BasicTestsQ31.cpp
@ -254,12 +262,14 @@ set(TESTSRC
Source/Tests/ExampleCategoryQ7.cpp Source/Tests/ExampleCategoryQ7.cpp
) )
if ((NOT ARMAC5) AND (FLOAT16TESTS) AND ((FLOAT16) OR (MVEF) OR (HELIUM) OR (NEON) OR (NEONEXPERIMENTAL))) if ((NOT ARMAC5) AND (FLOAT16TESTS) AND ((FLOAT16) OR (MVEF) OR (HELIUM) OR (NEON) OR (NEONEXPERIMENTAL)))
set(TESTSRC16 set(TESTSRC16
Source/Tests/BasicTestsF16.cpp Source/Tests/BasicTestsF16.cpp
Source/Tests/TransformCF16.cpp Source/Tests/TransformCF16.cpp
) )
endif() endif()
endif()
target_include_directories(TestingLib PUBLIC Include/Tests) target_include_directories(TestingLib PUBLIC Include/Tests)
@ -338,8 +348,10 @@ SET(DSP ${ROOT}/CMSIS/DSP)
target_include_directories(TestingLib PUBLIC "${DSP}/Include") target_include_directories(TestingLib PUBLIC "${DSP}/Include")
target_link_libraries(TestingLib PRIVATE "${REFLIBNAME}") target_link_libraries(TestingLib PRIVATE "${REFLIBNAME}")
else() else()
if (NOT NOCMSIS)
target_link_libraries(TestingLib PRIVATE CMSISDSP) target_link_libraries(TestingLib PRIVATE CMSISDSP)
endif() endif()
endif()
if(NN) if(NN)
target_link_libraries(TestingLib PRIVATE CMSISNN) target_link_libraries(TestingLib PRIVATE CMSISNN)
@ -348,7 +360,7 @@ target_include_directories(TestingLib PRIVATE FrameworkInclude)
target_include_directories(TestingLib PRIVATE GeneratedInclude) target_include_directories(TestingLib PRIVATE GeneratedInclude)
configLib(TestingLib ${ROOT}) configLib(TestingLib ${ROOT})
configDsp(TestingLib ${ROOT}) #configDsp(TestingLib ${ROOT})
configLib(FrameworkLib ${ROOT}) configLib(FrameworkLib ${ROOT})
target_include_directories(FrameworkLib PRIVATE FrameworkInclude) target_include_directories(FrameworkLib PRIVATE FrameworkInclude)
@ -379,7 +391,7 @@ configApp(Testing ${ROOT})
target_link_libraries(Testing PRIVATE TestingLib) target_link_libraries(Testing PRIVATE TestingLib)
target_link_libraries(Testing PRIVATE FrameworkLib) target_link_libraries(Testing PRIVATE FrameworkLib)
if (EXTERNALBENCH) if (EXTERNAL)
target_include_directories(${EXTERNALPROJECT} PRIVATE FrameworkInclude) target_include_directories(${EXTERNALPROJECT} PRIVATE FrameworkInclude)
target_include_directories(${EXTERNALPROJECT} PRIVATE GeneratedInclude) target_include_directories(${EXTERNALPROJECT} PRIVATE GeneratedInclude)
target_link_libraries(TestingLib PRIVATE ${EXTERNALPROJECT}) target_link_libraries(TestingLib PRIVATE ${EXTERNALPROJECT})

Write Preview
Loading…
Cancel
Save