Merge branch 'master' of git:cadabra2

Author: kpeeters

cmake/modules/FindGLIBMM.cmake

@@ -6,11 +6,12 @@ if(WIN32)
 else()
   find_package(PkgConfig REQUIRED)
   if(MACOS)
-    execute_process(COMMAND breq --prefix [email protected]  OUTPUT_VARIABLE GLIBMM_PREFIX)
-    execute_process(COMMAND breq --prefix [email protected] OUTPUT_VARIABLE CAIROMM_PREFIX)
-    execute_process(COMMAND breq --prefix [email protected] OUTPUT_VARIABLE PANGOMM_PREFIX)
-    execute_process(COMMAND breq --prefix [email protected]   OUTPUT_VARIABLE ATKMM_PREFIX)    
+    execute_process(COMMAND brew --prefix [email protected]  OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GLIBMM_PREFIX)
+    execute_process(COMMAND brew --prefix [email protected] OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE CAIROMM_PREFIX)
+    execute_process(COMMAND brew --prefix [email protected] OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PANGOMM_PREFIX)
+    execute_process(COMMAND brew --prefix [email protected]   OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE ATKMM_PREFIX)
     set( ENV{PKG_CONFIG_PATH} "${GLIBMM_PREFIX}/lib/pkgconfig:${CAIROMM_PREFIX}/lib/pkgconfig:${PANGOMM_PREFIX}/lib/pkgconfig:${ATKMM_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" )
+    message(STATUS "Using PKG_CONFIG_PATH = $ENV{PKG_CONFIG_PATH}")
   endif()
   pkg_check_modules(GLIBMM3 REQUIRED glibmm-2.4)
   include_directories(${GLIBMM3_INCLUDE_DIRS})

cmake/version.cmake

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