update macos system version for SDK link

Author: u3dreal

cmake/PlatformSpecific.cmake

@@ -163,10 +163,10 @@ IF(APPLE)
 
 	EXECUTE_PROCESS(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
 
-	SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) # Minimum OS requirements for LuxCore
+	SET(CMAKE_OSX_DEPLOYMENT_TARGET 11.0) # Minimum OS requirements for LuxCore
 
   IF(${MAC_SYS} MATCHES 20)
-    SET(OSX_SYSTEM 11.3)
+    SET(OSX_SYSTEM 12.0)
     ELSEIF(${MAC_SYS} MATCHES 19)
 		SET(OSX_SYSTEM 10.15)
     ELSEIF(${MAC_SYS} MATCHES 18)
@@ -192,7 +192,7 @@ IF(APPLE)
 
   SET(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx) # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT, gets latest available
 
-	# set a precedence of sdk path over all other default search paths
+	# set a precedence of sdk path over all other default search pathes
 	SET(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT})
 
 	### options

cmake/SpecializedConfig/Config_OSX.cmake

@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Configuration ( Jens Verwiebe )
+# Configuration ( Jens Verwiebe, Gregor Quade )
 #
 ###########################################################################
 
@@ -15,7 +15,11 @@ MESSAGE(STATUS "OSX_DEPENDENCY_ROOT : " ${OSX_DEPENDENCY_ROOT})
 set(OSX_SEARCH_PATH     ${OSX_DEPENDENCY_ROOT})
 
 # Libs present in system ( /usr )
-SET(SYS_LIBRARIES z )
+#SET(SYS_LIBRARIES z )
+
+SET(SYS_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libz.a )
+
+
 
 execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())" OUTPUT_VARIABLE PY3_INCLUDE)
 execute_process(COMMAND python3 -c "import distutils.sysconfig as sysconfig; print(sysconfig.get_config_var('LIBDIR'))" OUTPUT_VARIABLE PY3_LIB)
@@ -59,17 +63,15 @@ set(TBB_INCLUDE_PATH "${OSX_SEARCH_PATH}/include")
 set(BLOSC_SEARCH_PATH "${OSX_SEARCH_PATH}")
 set(BLOSC_INCLUDE_PATH "${OSX_SEARCH_PATH}/include")
 
-find_library(OPENMP_LIB libiomp5.dylib HINTS ${OSX_SEARCH_PATH}/lib)
+find_library(OPENMP_LIB libomp.a HINTS ${OSX_SEARCH_PATH}/lib)
 
 if(NOT OPENMP_LIB)
     message(FATAL_ERROR "OpenMP library not found")
 else()
-    set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${OSX_SEARCH_PATH}/include")
+    set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I${OSX_SEARCH_PATH}/include")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${OpenMP_CXX_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -liomp5")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -liomp5")
-    #INSTALL(FILES ${OSX_SEARCH_PATH}/lib/libomp.dylib DESTINATION lib)
-    #INSTALL(FILES ${OSX_SEARCH_PATH}/lib/libiomp5.dylib DESTINATION lib)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -lomp")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${OSX_SEARCH_PATH}/lib -lomp")
     set(OPENMP_FOUND 1)
     MESSAGE(STATUS "OpenMP found")
 endif()
@@ -79,31 +81,32 @@ find_path(GLEW_INCLUDE_DIR glew.h PATHS ${OSX_SEARCH_PATH}/include/GL )
 find_library(GLEW_LIBRARY libGLEW.a PATHS ${OSX_SEARCH_PATH}/lib )
 set(GLEW_FOUND 1)
 
-set(GLUT_SEARCH_PATH          "${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/glut.framework")
+set(GLUT_SEARCH_PATH      "${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/glut.framework")
 set(GLUT_INCLUDE_PATH 		"${GLUT_SEARCH_PATH}/Headers")
 
 SET(OPENEXR_ROOT "${OSX_SEARCH_PATH}")
 
 # Libs with hardcoded paths ( macos repo )
-SET(TIFF_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libtiff.dylib ${OSX_DEPENDENCY_ROOT}/lib/liblzma.a)
+
+SET(TIFF_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libtiff.a ${OSX_DEPENDENCY_ROOT}/lib/liblzma.a)
 SET(TIFF_INCLUDE_DIR ${OSX_DEPENDENCY_ROOT}/include/tiff)
 SET(TIFF_FOUND ON)
+
 SET(JPEG_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libjpeg.a)
 SET(JPEG_INCLUDE_DIR ${OSX_DEPENDENCY_ROOT}/include/jpeg)
 SET(JPEG_FOUND ON)
-SET(PNG_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libpng.a ${SYS_LIBRARIES})
+
+SET(PNG_LIBRARIES ${OSX_DEPENDENCY_ROOT}/lib/libpng.a ${OSX_DEPENDENCY_ROOT}/lib/libz.a)
 SET(PNG_INCLUDE_DIR ${OSX_DEPENDENCY_ROOT}/include/png)
 SET(PNG_FOUND ON)
-SET(EMBREE_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libembree3.dylib)
+
+SET(EMBREE_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libembree3.dylib) # ${OSX_DEPENDENCY_ROOT}/lib/libsys.a ${OSX_DEPENDENCY_ROOT}/lib/libmath.a ${OSX_DEPENDENCY_ROOT}/lib/libsimd.a ${OSX_DEPENDENCY_ROOT}/lib/liblexers.a ${OSX_DEPENDENCY_ROOT}/lib/libtasking.a ${OSX_DEPENDENCY_ROOT}/lib/libembree_sse42.a ${OSX_DEPENDENCY_ROOT}/lib/libembree_avx.a ${OSX_DEPENDENCY_ROOT}/lib/libembree_avx2.a)
 SET(EMBREE_INCLUDE_PATH ${OSX_DEPENDENCY_ROOT}/include/embree3)
 SET(EMBREE_FOUND ON)
-#INSTALL(FILES ${OSX_DEPENDENCY_ROOT}/lib/libembree3.dylib DESTINATION lib)
-#INSTALL(FILES ${OSX_DEPENDENCY_ROOT}/lib/libembree3.3.dylib DESTINATION lib)
 
-SET(OPENIMAGEIO_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageIO.dylib)
+SET(OPENIMAGEIO_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageIO.a)
 SET(OPENIMAGEIO_INCLUDE_PATH ${OSX_DEPENDENCY_ROOT}/include/OpenImageIO)
 SET(OPENIMAGEIO_FOUND ON)
 
-SET(OIDN_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageDenoise.dylib)
+SET(OIDN_LIBRARY ${OSX_DEPENDENCY_ROOT}/lib/libOpenImageDenoise.a ${OSX_DEPENDENCY_ROOT}/lib/libdnnl.a ${OSX_DEPENDENCY_ROOT}/lib/libcommon.a )
 SET(OIDN_INCLUDE_PATH ${OSX_DEPENDENCY_ROOT}/include/OpenImageDenoise)
-