Merge branch 'master' into port_issue_211

.github/workflows/build_dispatch.yml

@@ -1,5 +1,8 @@
 on: [push]
 
+permissions:
+  contents: read
+
 jobs:
   trigger_externals:
     if: ${{ github.repository_owner == 'nest' && github.ref_name == 'master' }}

.github/workflows/stale.yml

@@ -4,6 +4,9 @@ on:
   schedule:
   - cron: '31 8 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   stale:
 

CMakeLists.txt

@@ -17,9 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with NEST.  If not, see <http://www.gnu.org/licenses/>
 
-# Version range from minimum required (3.12 for macOS OpenMP)
-# up to newest version tested, see https://cliutils.gitlab.io/modern-cmake/chapters/basics.html
-cmake_minimum_required( VERSION 3.12...3.16 )
+cmake_minimum_required( VERSION 3.19 )
 
 # add cmake modules: for all `include(...)` first look here
 list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
@@ -65,6 +63,8 @@ set( with-ltdl ON CACHE STRING "Build with ltdl library [default=ON]. To set a s
 set( with-gsl ON CACHE STRING "Build with the GSL library [default=ON]. To set a specific library, give the install path." )
 
 # NEST properties
+set( with-modelset "full" CACHE STRING "The modelset to include. Sample configurations are in the modelsets directory. This option is mutually exclusive with -Dwith-models. [default=full]." )
+set( with-models OFF CACHE STRING "The models to include as a semicolon-separated list of model headers (without the .h extension). This option is mutually exclusive with -Dwith-modelset. [default=OFF]." )
 set( tics_per_ms "1000.0" CACHE STRING "Specify elementary unit of time [default=1000 tics per ms]." )
 set( tics_per_step "100" CACHE STRING "Specify resolution [default=100 tics per step]." )
 set( external-modules OFF CACHE STRING "External NEST modules to be linked in, separated by ';', [default=OFF]." )
@@ -154,19 +154,19 @@ nest_process_target_bits_split()
 nest_process_userdoc()
 nest_process_devdoc()
 
+nest_process_models()
+
 # These two function calls must come last, as to prevent unwanted interactions of the newly set flags
 # with detection/compilation operations carried out in earlier functions. The optimize/debug flags set
-# using these functions should only apply to the compilation of NEST.
+# using these functions should only apply to the compilation of NEST, not to that of test programs
+# generated by CMake when it tries to detect compiler options or such.
 nest_process_with_optimize()
 nest_process_with_debug()
 
 nest_get_color_flags()
 set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NEST_C_COLOR_FLAGS}" )
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NEST_CXX_COLOR_FLAGS}" )
 
-# requires HAVE_LIBNEUROSIM
-nest_default_modules()
-
 nest_write_static_module_header( "${PROJECT_BINARY_DIR}/nest/static_modules.h" )
 
 # check additionals

README.md

@@ -3,7 +3,7 @@
 [![Documentation](https://img.shields.io/readthedocs/nest-simulator?logo=readthedocs&logo=Read%20the%20Docs&label=Documentation)](https://nest-simulator.org/documentation)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2218/badge)](https://bestpractices.coreinfrastructure.org/projects/2218)
 [![License](http://img.shields.io/:license-GPLv2+-green.svg)](http://www.gnu.org/licenses/gpl-2.0.html)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5886894.svg)](https://doi.org/10.5281/zenodo.5886894)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.8069926.svg)](https://doi.org/10.5281/zenodo.8069926)
 
 [![Latest release](https://img.shields.io/github/release/nest/nest-simulator.svg?color=brightgreen&label=latest%20release)](https://github.com/nest/nest-simulator/releases)
 [![GitHub contributors](https://img.shields.io/github/contributors/nest/nest-simulator?logo=github)](https://github.com/nest/nest-simulator)

VERSION

@@ -1 +1 @@
-3.4.0-post0.dev0
+3.5.0-post0.dev0