Bump version number to 7.9.0 and merge recent bug fixes from main [WIP]

CMakeLists.txt

@@ -7,8 +7,10 @@ project(
   LANGUAGES C CXX Fortran)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # Compiler flags.  Not all tested thoroughly...
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -46,18 +48,41 @@ endif()
 # Build options
 option(ENABLE_NBODY "Enable EXP n-body" ON)
 option(ENABLE_PYEXP "Enable the Python bindings" ON)
+option(ENABLE_PYEXP_ONLY "Python bindings and support libraries only" OFF)
+option(ENABLE_UTILS "Enable build of the EXP standalone utilities" OFF)
 option(ENABLE_PNG "Enable PNG graphics support" FALSE)
 option(ENABLE_CUDA "Enable CUDA" FALSE)
 option(ENABLE_SLURM "Enable SLURM checkpointing support" FALSE)
 option(ENABLE_XDR "Enable RPC/XDR support for Tipsy standard" FALSE)
 option(ENABLE_VTK "Configure VTK if available" FALSE)
 option(ENABLE_CUDA_SINGLE "Use real*4 instead of real*8 for CUDA" FALSE)
-option(ENABLE_USER "Enable basic user modules" ON)
+option(ENABLE_USER "Enable compilation of user modules" ON)
 option(ENABLE_SLCHECK "Enable *careful* Sturm-Liouville solutions" TRUE)
 option(ENABLE_TESTS "Enable build tests for EXP, pyEXP and helpers" ON)
+option(ENABLE_MINIMAL "Compile EXP support libraries only" OFF)
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 option(BUILD_DOCS "Build documentation" OFF)
 
+# Metaflag for minimal build
+
+if(ENABLE_MINIMAL)
+  set(ENABLE_NBODY OFF)
+  set(ENABLE_PYEXP OFF)
+  set(ENABLE_USER  OFF)
+  set(ENABLE_UTILS OFF)
+  set(ENABLE_TESTS OFF)
+endif()
+
+# Metaflag for pyEXP only
+
+if(ENABLE_PYEXP_ONLY)
+  set(ENABLE_NBODY OFF)
+  set(ENABLE_PYEXP ON)
+  set(ENABLE_USER  OFF)
+  set(ENABLE_UTILS OFF)
+  set(ENABLE_TESTS OFF)
+endif()
+
 # Set mpirun launcher for CTest
 
 set(EXP_MPI_LAUNCH "mpirun" CACHE STRING "Command to run an MPI application (for unit tests only)")
@@ -252,12 +277,15 @@ add_subdirectory(expui)
 if (ENABLE_NBODY)
   add_subdirectory(src)
 endif()
-add_subdirectory(utils)
+if (ENABLE_UTILS)
+  add_subdirectory(utils)
+endif()
 if (ENABLE_PYEXP)
   add_subdirectory(pyEXP)
 endif()
-
-add_subdirectory(extern/user-modules)
+if (ENABLE_USER)
+  add_subdirectory(extern/user-modules)
+endif()
 
 # Build the tests; set ENABLE_TEST=OFF to disable
 if(ENABLE_TESTS)
@@ -278,6 +306,14 @@ endif()
 
 # Force installation of the yaml-cpp libraries
 install(TARGETS yaml-cpp DESTINATION lib)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/extern/yaml-cpp/include/
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+                FILES_MATCHING PATTERN "*.h")
+
+# Install HighFive headers
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/extern/HighFive/include/
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    PATTERN "*.in" EXCLUDE)
 
 # Check for doxygen is the user wants web docs
 if (BUILD_DOCS)

INSTALL.md

@@ -123,6 +123,20 @@ The most important of these are:
    If you would like either of the native graphic support enabled set
    `-DENABLE_PNG=ON` and/or `-DENABLE_VTK=ON`.
 
+7. We provide an option, `-DENABLE_MINIMAL=ON`, to compile a minimal
+   for clients who wish to use the EXP C++ user interface to access
+   the classes used by `pyEXP`. The minimal library set and public
+   headers will be installed in the destination target.
+
+8. A related option, `-DENABLE_PYEXP_ONLY`, builds only the `pyEXP`
+   interface its dependencies without any other support binaries.
+
+9. The CMake configuration makes shared-object libraries by
+   default. This is necessary for compiling `pyEXP` and user
+   modules. If you need static libraries for some reason, EXP will
+   compile with `-DBUILD_SHARED_LIBS=OFF -DENABLE_PYEXP=NO
+   -DENABLE_USER=NO`.
+
 
 ## Configuring Eigen3
 

doc/exp.cfg

@@ -964,6 +964,8 @@ INPUT                  = ./intro.doc \
                          ../include \
                          ../src \
                          ../src/user \
+			 ../exputil \
+			 ../expui \
                          ../utils/ICs \
                          ../utils/Analysis \
                          ../utils/PhaseSpace
@@ -1788,7 +1790,7 @@ FORMULA_MACROFILE      =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_MATHJAX            = NO
+USE_MATHJAX            = YES
 
 # With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
 # Note that the different versions of MathJax have different requirements with
@@ -1948,7 +1950,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of