Fixes to build/run on Apple silicon.

Author: Kasper Peeters

CMakeLists.txt

@@ -1,6 +1,12 @@
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 set(CADABRA_CMAKE_VERSION 3.1)
 
+# Policy settings for CMake to resolve ambiguities.
+
+cmake_policy(SET CMP0042 NEW)
+cmake_policy(SET CMP0054 NEW)
+cmake_policy(SET CMP0127 NEW)
+
 cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})
 if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
 	set(CMAKE_CXX_STANDARD 14)

README.rst

@@ -327,12 +327,7 @@ macOS
 
 Cadabra builds with the standard Apple compiler, but in order to build
 on macOS you need a number of packages from Homebrew (see
-https://brew.sh). Quite a few Homebrew installations have broken
-permissions; best to first do::
-
-    sudo chown -R ${USER}:admin /usr/local/
-
-to clean that up. Then install the required dependencies with::
+https://brew.sh). Install the required dependencies with::
 
     brew install cmake boost pcre gmp python3 
     brew install pkgconfig 
@@ -344,13 +339,17 @@ that.
 
 You also need a TeX installation such as MacTeX,
 https://tug.org/mactex/ .  *Any* TeX will do, as long as 'latex' and
-'dvipng' are available. Make sure to *install TeX* before attempting
-to build Cadabra, otherwise the Cadabra style files will not be
-installed in the appropriate place. Make sure 'latex' works from the
-terminal in which you will build Cadabra.
+'dvipng' are available, so you simply do::
+
+    brew install mactex
+
+Make sure to *install TeX* before attempting to build Cadabra,
+otherwise the Cadabra style files will not be installed in the
+appropriate place. Make sure 'latex' works from the terminal in which
+you will build Cadabra.
 
 You can build against an Anaconda Python installation (in case you
-prefer Anaconda over the Homebrew Python); cmake will automaticaly
+prefer Anaconda over the Homebrew Python); cmake will automatically
 pick this up if available.
 
 You need to clone the cadabra2 git repository (if you download the

cmake/policies.cmake

@@ -7,3 +7,6 @@ endif()
 if (POLICY CMP0054)
   cmake_policy(SET CMP0054 NEW)
 endif()
+if (POLICY CMP0127)
+  cmake_policy(SET CMP0127 NEW)
+endif()

cmake/version.cmake

@@ -1,7 +1,7 @@
 set(CADABRA_VERSION_MAJOR 2)
 set(CADABRA_VERSION_MINOR 3)
-set(CADABRA_VERSION_PATCH 7)
-set(CADABRA_VERSION_TWEAK 6)
+set(CADABRA_VERSION_PATCH 8)
+set(CADABRA_VERSION_TWEAK 0)
 set(COPYRIGHT_YEARS "2001-2021")
 math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
 find_program(GIT git PATHS ${GIT_DIR})

config/install_script.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Cadabra2"
-#define MyAppVersion "2.3.7"
+#define MyAppVersion "2.3.8"
 #define MyAppPublisher "Kasper Peeters"
 #define MyAppURL "https://www.cadabra.science/"
 #define MyAppExeName "cadabra2-gtk.exe"

core/properties/Indices.hh

@@ -15,7 +15,7 @@ namespace cadabra {
 				return "name";
 				};
 			virtual match_t equals(const property *) const override;
-			virtual void    validate(const Kernel&, const Ex&) const;
+			virtual void    validate(const Kernel&, const Ex&) const override;
 
 			//		virtual void display(std::ostream&) const override;
 			virtual void latex(std::ostream&) const override;

tests/components.cdb

@@ -757,6 +757,7 @@ def test37():
     complete(ss, $gt$)
     ex:= g;
     substitute(ex, ss)
+    simplify(ex)
     tst:= -r**4 \sin(\theta)**2 - @(ex);
     assert(tst==0)
     print("Test 37 passed")