CMSIS-DSP: Changed cmake required minimum version

6 years ago · c0d3b61f37
parent 2f270b6e5f
commit c0d3b61f37
31 changed files with 48 additions and 36 deletions
--- a/DSP_Lib_TestSuite/CMakeLists.txt
+++ b/DSP_Lib_TestSuite/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 cmake_policy(SET CMP0077 NEW)
 # The tests are assuming that MATRIX_CHECK is enabled when building
 # CMSIS-DSP.
--- a/DSP_Lib_TestSuite/RefLibs/CMakeLists.txt
+++ b/DSP_Lib_TestSuite/RefLibs/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(DspRefLibs)

--- a/Examples/ARM/arm_bayes_example/CMakeLists.txt
+++ b/Examples/ARM/arm_bayes_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_bayes_example VERSION 0.1)


--- a/Examples/ARM/arm_class_marks_example/CMakeLists.txt
+++ b/Examples/ARM/arm_class_marks_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_class_marks_example VERSION 0.1)


--- a/Examples/ARM/arm_convolution_example/CMakeLists.txt
+++ b/Examples/ARM/arm_convolution_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_convolution_example VERSION 0.1)


--- a/Examples/ARM/arm_dotproduct_example/CMakeLists.txt
+++ b/Examples/ARM/arm_dotproduct_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_dotproduct_example VERSION 0.1)


--- a/Examples/ARM/arm_fft_bin_example/CMakeLists.txt
+++ b/Examples/ARM/arm_fft_bin_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_fft_bin_example VERSION 0.1)


--- a/Examples/ARM/arm_fir_example/CMakeLists.txt
+++ b/Examples/ARM/arm_fir_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_fir_example VERSION 0.1)


--- a/Examples/ARM/arm_graphic_equalizer_example/CMakeLists.txt
+++ b/Examples/ARM/arm_graphic_equalizer_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_graphic_equalizer_example VERSION 0.1)


--- a/Examples/ARM/arm_linear_interp_example/CMakeLists.txt
+++ b/Examples/ARM/arm_linear_interp_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_linear_interp_example VERSION 0.1)


--- a/Examples/ARM/arm_matrix_example/CMakeLists.txt
+++ b/Examples/ARM/arm_matrix_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_matrix_example VERSION 0.1)


--- a/Examples/ARM/arm_signal_converge_example/CMakeLists.txt
+++ b/Examples/ARM/arm_signal_converge_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_signal_convergence_example VERSION 0.1)


--- a/Examples/ARM/arm_sin_cos_example/CMakeLists.txt
+++ b/Examples/ARM/arm_sin_cos_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_sin_cos_example VERSION 0.1)


--- a/Examples/ARM/arm_svm_example/CMakeLists.txt
+++ b/Examples/ARM/arm_svm_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_svm_example VERSION 0.1)


--- a/Examples/ARM/arm_variance_example/CMakeLists.txt
+++ b/Examples/ARM/arm_variance_example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 project (arm_variance_example VERSION 0.1)


--- a/README.md
+++ b/README.md
@ -71,7 +71,7 @@ Create a folder BuildCMSISOnly.
 Inside the folder, create a CMakeLists.txt with the following content:

 ```cmake
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 # Define the project
 project (testcmsisdsp VERSION 0.1)
--- a/Source/BasicMathFunctions/CMakeLists.txt
+++ b/Source/BasicMathFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPBasicMath)

--- a/Source/BayesFunctions/CMakeLists.txt
+++ b/Source/BayesFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPBayes)

--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 cmake_policy(SET CMP0077 NEW)
 project(CMSISDSP)

--- a/Source/CommonTables/CMakeLists.txt
+++ b/Source/CommonTables/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPCommon)

--- a/Source/ComplexMathFunctions/CMakeLists.txt
+++ b/Source/ComplexMathFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPComplexMath)

--- a/Source/ControllerFunctions/CMakeLists.txt
+++ b/Source/ControllerFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPController)

--- a/Source/DistanceFunctions/CMakeLists.txt
+++ b/Source/DistanceFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPDistance)

--- a/Source/FastMathFunctions/CMakeLists.txt
+++ b/Source/FastMathFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPFastMath)

--- a/Source/FilteringFunctions/CMakeLists.txt
+++ b/Source/FilteringFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPFiltering)

--- a/Source/MatrixFunctions/CMakeLists.txt
+++ b/Source/MatrixFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPMatrix)

--- a/Source/SVMFunctions/CMakeLists.txt
+++ b/Source/SVMFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPSVM)

--- a/Source/StatisticsFunctions/CMakeLists.txt
+++ b/Source/StatisticsFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPStatistics)

--- a/Source/SupportFunctions/CMakeLists.txt
+++ b/Source/SupportFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPSupport)

--- a/Source/TransformFunctions/CMakeLists.txt
+++ b/Source/TransformFunctions/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)

 project(CMSISDSPTransform)

--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.14)
 cmake_policy(SET CMP0077 NEW)
 include(CMakePrintHelpers)

@ -82,7 +82,7 @@ option(EMBEDDED "Embedded Mode" ON)

 option(FLOAT16TESTS "Float16 tests" OFF)
 option(MICROBENCH "Micro benchmarks" OFF)
-option(EXTERNALBENCH "External benchmarks" OFF)
+option(EXTERNAL "External benchmarks or tests" OFF)

 project(Testing)

@ -98,7 +98,7 @@ set(ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(TESTFRAMEWORK ON)
 include(config)

-if (NOT REFLIB)
+if ((NOT REFLIB) AND (NOT NOCMSIS))
 add_subdirectory(../Source bin_dsp)
 endif()

@ -124,7 +124,7 @@ if (MICROBENCH)

 endif()

-if (EXTERNALBENCH)
+if (EXTERNAL)
  add_subdirectory(${EXTERNALDIR} bin_external)
  set(STANDARDBENCH OFF)
 endif()
@ -182,6 +182,8 @@ set (NNSRC

 else()

+set(STANDARDTEST ON)
+
 set(NNSRC
  Source/Tests/NNSupport.cpp
  Source/Tests/Pooling.cpp
@ -189,6 +191,12 @@ set(NNSRC
  Source/Tests/FullyConnected.cpp
  )

+if (EXTERNAL)
+  add_subdirectory(${EXTERNALDIR} bin_external)
+  set(STANDARDTEST OFF)
+endif()
+
+if (STANDARDTEST)
 set(TESTSRC 
  Source/Tests/BasicTestsF32.cpp
  Source/Tests/BasicTestsQ31.cpp
@ -254,12 +262,14 @@ set(TESTSRC
  Source/Tests/ExampleCategoryQ7.cpp
  )

+
 if ((NOT ARMAC5) AND (FLOAT16TESTS) AND ((FLOAT16) OR (MVEF) OR (HELIUM) OR (NEON) OR (NEONEXPERIMENTAL)))
 set(TESTSRC16 
  Source/Tests/BasicTestsF16.cpp
  Source/Tests/TransformCF16.cpp
  )
 endif()
+endif() 

 target_include_directories(TestingLib PUBLIC Include/Tests)

@ -338,8 +348,10 @@ SET(DSP ${ROOT}/CMSIS/DSP)
 target_include_directories(TestingLib PUBLIC "${DSP}/Include")
 target_link_libraries(TestingLib PRIVATE "${REFLIBNAME}")
 else()
+if (NOT NOCMSIS)
 target_link_libraries(TestingLib PRIVATE CMSISDSP)
 endif()
+endif()

 if(NN)
 target_link_libraries(TestingLib PRIVATE CMSISNN)
@ -348,7 +360,7 @@ target_include_directories(TestingLib PRIVATE FrameworkInclude)
 target_include_directories(TestingLib PRIVATE GeneratedInclude)

 configLib(TestingLib ${ROOT})
-configDsp(TestingLib ${ROOT})
+#configDsp(TestingLib ${ROOT})

 configLib(FrameworkLib ${ROOT})
 target_include_directories(FrameworkLib PRIVATE FrameworkInclude)
@ -379,7 +391,7 @@ configApp(Testing ${ROOT})
 target_link_libraries(Testing PRIVATE TestingLib)
 target_link_libraries(Testing PRIVATE FrameworkLib)

-if (EXTERNALBENCH)
+if (EXTERNAL)
  target_include_directories(${EXTERNALPROJECT} PRIVATE FrameworkInclude)
  target_include_directories(${EXTERNALPROJECT} PRIVATE GeneratedInclude)
  target_link_libraries(TestingLib PRIVATE ${EXTERNALPROJECT})