Fix build problems on macOS.

Author: kpeeters

CMakeLists.txt

@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})
 set(CMAKE_CXX_STANDARD 14)
 project(Cadabra)
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(MACOS TRUE)
+endif()
 
 #---------------------------------------------------------------------------
 # Preamble

client_server/CMakeLists.txt

@@ -16,8 +16,13 @@ set(INSTALL_LATEX_DIR "${CMAKE_INSTALL_PREFIX}/share/cadabra2")
 #---------------------------------------------------------------------------
 
 find_package(GLIBMM  REQUIRED)
-find_package(SQLite3 REQUIRED)
-find_package(Threads REQUIRED)
+find_package(SQLITE3 REQUIRED)
+# Don't set pthreads to required. Either we're on a platform where explict
+# linking with -lpthread is the norm (e.g. Linux) and it'll be found, or we're
+# on a platform that include pthreads by default (e.g. BSD, macOS) where this
+# won't find anything, or we're on a road-much-less-traveled OS where the user
+# can figure out what's wrong without a hard error here.
+find_package(Threads)
 find_package(Boost 1.53.0 COMPONENTS system program_options date_time filesystem REQUIRED)
 
 #---------------------------------------------------------------------------

cmake/modules/FindGLIBMM.cmake

@@ -5,6 +5,13 @@ if(WIN32)
   endif()
 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)    
+    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}" )
+  endif()
   pkg_check_modules(GLIBMM3 REQUIRED glibmm-2.4)
   include_directories(${GLIBMM3_INCLUDE_DIRS})
   link_directories(${GLIBMM3_LIBRARY_DIRS})

cmake/modules/FindSQLite3.cmake renamed to cmake/modules/FindSQLITE3.cmake

@@ -11,7 +11,7 @@
 # - Find sqlite3
 # Find the native SQLITE3 headers and libraries.
 #
-# SQLITE3_INCLUDE_DIRS	- where to find sqlite3.h, etc.
+# SQLITE3_INCLUDE_DIR	- where to find sqlite3.h, etc.
 # SQLITE3_LIBRARIES	- List of libraries when using sqlite.
 # SQLITE3_FOUND	- True if sqlite found.
 
@@ -24,27 +24,28 @@ if(WIN32)
 else()
   find_package(PkgConfig REQUIRED)
   pkg_check_modules(SQLITE3 REQUIRED sqlite3)
-  message("-- Found sqlite library path ${SQLITE3_LIBRARIES}")
+  message("-- Found sqlite3 library path ${SQLITE3_LIBRARIES}")
+  message("-- Found sqlite3 include path ${SQLITE3_INCLUDE_DIRS}") 
   set(SQLITE3_LIBRARY ${SQLITE3_LIBRARIES})
-  set(SQLITE3_INCLUDE_DIR ${SQLITE3_INCLUDE_DIRS})
+  set(SQLITE3_INCLUDE_DIR ${SQLITE3_INCLUDE_DIR})
   set(SQLITE3_FOUND)
 endif()
 
 # Handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if all listed variables are TRUE.
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY) # SQLITE3_INCLUDE_DIR)
 
 
 # Copy the results to the output variables.
 IF(SQLITE3_FOUND)
 	SET(SQLITE3_LIBRARIES ${SQLITE3_LIBRARY})
-	SET(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
+	SET(SQLITE3_INCLUDE_DIR ${SQLITE3_INCLUDE_DIR})
 ELSE(SQLITE3_FOUND)
 	SET(SQLITE3_LIBRARIES)
-	SET(SQLITE3_INCLUDE_DIRS)
+	SET(SQLITE3_INCLUDE_DIR)
 ENDIF(SQLITE3_FOUND)
 
 
-MARK_AS_ADVANCED(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES)
+MARK_AS_ADVANCED(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARIES)
 
 

cmake/version.cmake

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

examples/schwarzschild.ipynb

@@ -64,7 +64,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -98,7 +98,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -156,7 +156,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -178,7 +178,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -231,7 +231,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -268,7 +268,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -288,7 +288,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {

frontend/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})
 project(Cadabra)
 
 

frontend/gtkmm/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})
 project(CadabraGtkmm)
 
 
@@ -19,7 +19,7 @@ set(INSTALL_ICONS_DIR share/icons CACHE PATH "Installation directory for icons."
 #---------------------------------------------------------------------------
 
 find_package(Threads)
-find_package(SQLite3)
+find_package(SQLITE3)
 find_package(GLIBMM)
 find_package(GTKMM3)
 find_package(Boost 1.45.0 COMPONENTS system)

tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})
 project(Cadabra)