CMSIS-DSP: Changed cmake required minimum version

CMSIS/DSP/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.

CMSIS/DSP/DSP_Lib_TestSuite/RefLibs/CMakeLists.txt

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

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)
 
 

CMSIS/DSP/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)

CMSIS/DSP/Source/BasicMathFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/BayesFunctions/CMakeLists.txt

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

CMSIS/DSP/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)
 

CMSIS/DSP/Source/CommonTables/CMakeLists.txt

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

CMSIS/DSP/Source/ComplexMathFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/ControllerFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/DistanceFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/FastMathFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/FilteringFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/MatrixFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/SVMFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/StatisticsFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/SupportFunctions/CMakeLists.txt

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

CMSIS/DSP/Source/TransformFunctions/CMakeLists.txt

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

CMSIS/DSP/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})