macOS compatibility (#167)

* Enable arch optimizations on ARM

* Silence OpenGL deprecation warnings on macOS

* Fix OpenMP support for Clang on macOS

* Update definitions altered in Discregrid

* Fix getProgramPath on macOS

* Add Accelerate support to AVX math

* Port MiniGL to OpenGL 3.3 Core

- Properly destroy OpenGL objects

* Fix template lookup with Clang

* Fix type in pySPlisHSPlasH/UtilitiesModule

* Fix version inclusion with Clang

* Update CompactNSearch and Discregrid

* TMP: Use fork of CompactNSearch

---------

Co-authored-by: Jan Bender <[email protected]>

Author: ruberith

CMake/Common.cmake

@@ -19,15 +19,28 @@ endif (USE_DOUBLE_PRECISION)
 
 cmake_dependent_option(USE_AVX "Use AVX" ON "NOT USE_DOUBLE_PRECISION" OFF)
 if (USE_AVX)
-	include(avx)
-	set_avx_flags()
-	if (FOUND_AVX2)
-		message(STATUS "Using AVX2")
+	set(FOUND_ACCELERATE OFF)
+	if (APPLE)
+		find_library(ACCELERATE Accelerate)
+	endif()
+	if (ACCELERATE)
+		set(FOUND_ACCELERATE ON)
+		message(STATUS "Using Accelerate")
+		link_libraries(${ACCELERATE})
+	else()
+		include(avx)
+		set_avx_flags()
+		if (FOUND_AVX2)
+			message(STATUS "Using AVX2")
+		endif()
+	endif()
+	if (FOUND_ACCELERATE OR FOUND_AVX2)
+		set(FOUND_SIMD ON)
 		add_definitions(-DUSE_AVX)
 	endif()
 endif()
 
-cmake_dependent_option(USE_PERFORMANCE_OPTIMIZATION "Optimize performance (higher memory consumption)" ON "FOUND_AVX2" OFF)
+cmake_dependent_option(USE_PERFORMANCE_OPTIMIZATION "Optimize performance (higher memory consumption)" ON "FOUND_SIMD" OFF)
 if (USE_PERFORMANCE_OPTIMIZATION)
 	add_definitions( -DUSE_PERFORMANCE_OPTIMIZATION)	
 endif (USE_PERFORMANCE_OPTIMIZATION)
@@ -64,8 +77,12 @@ option(USE_OpenMP "Use OpenMP" ON)
 if(USE_OpenMP)
 	FIND_PACKAGE(OpenMP)
 	if(OPENMP_FOUND)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+		if (CMAKE_VERSION VERSION_GREATER "3.8")
+			link_libraries(OpenMP::OpenMP_CXX)
+		else()
+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+		endif()
 	endif()
 endif()
 
@@ -86,6 +103,9 @@ if (UNIX OR MINGW)
 	if (CI_BUILD)
 		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64")
 		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=x86-64")
+	elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=native")
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -mcpu=native")
 	else()
 		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native")
 		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=native")
@@ -101,6 +121,7 @@ endif(MINGW)
 
 if(APPLE)
 	set(CMAKE_MACOSX_RPATH 1)
+	add_definitions(-DGL_SILENCE_DEPRECATION)
 endif()
 
 if (MSVC)

CMakeLists.txt

@@ -40,6 +40,9 @@ endif()
 ## Eigen3 is used by most of the libraries that follow
 find_package(Eigen3 REQUIRED)
 add_definitions(-DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT)
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter${EIGEN3_INCLUDE_DIR}")
+endif()
 
 ################################################################################
 # own external libraries