pyrox.dev
1diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
2--- a/cmake/modules/SetUpMacOS.cmake
3+++ b/cmake/modules/SetUpMacOS.cmake
4@@ -28,17 +28,10 @@ if(CMAKE_VERSION VERSION_LESS 3.14.4)
5 endif()
6
7 if (CMAKE_SYSTEM_NAME MATCHES Darwin)
8- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
9- COMMAND cut -d . -f 1-2
10- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
11-
12 MESSAGE(STATUS "Found a macOS system ${MACOSX_VERSION}")
13
14- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
15 set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
16- endif()
17
18- if(MACOSX_VERSION VERSION_GREATER 10.4)
19 #TODO: check haveconfig and rpath -> set rpath true
20 #TODO: check Thread, define link command
21 #TODO: more stuff check configure script
22@@ -57,22 +50,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
23 SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
24 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
25 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
26- else()
27- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
28- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
29- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
30 endif()
31- endif()
32-
33- if(MACOSX_VERSION VERSION_GREATER 10.6)
34- set(MACOSX_SSL_DEPRECATED ON)
35- endif()
36- if(MACOSX_VERSION VERSION_GREATER 10.7)
37- set(MACOSX_ODBC_DEPRECATED ON)
38- endif()
39- if(MACOSX_VERSION VERSION_GREATER 10.8)
40- set(MACOSX_GLU_DEPRECATED ON)
41- endif()
42
43 if (CMAKE_COMPILER_IS_GNUCXX)
44 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common")
45@@ -130,7 +108,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
46 endif()
47
48 #---Set Linker flags----------------------------------------------------------------------
49- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}")
50 else (CMAKE_SYSTEM_NAME MATCHES Darwin)
51 MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.")
52 endif (CMAKE_SYSTEM_NAME MATCHES Darwin)
53diff a/config/root-config.in b/config/root-config.in
54--- a/config/root-config.in
55+++ b/config/root-config.in
56@@ -312,12 +312,6 @@ macosxicc)
57 ;;
58 macosx64|macosxarm64)
59 # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
60- macosx_major=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1 | sed -e 's/^[[:space:]]*//'`
61- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
62- # cannot find the one linked to libGraf if relocated after built
63- if [ $macosx_major -eq 10 -a $macosx_minor -le 4 ]; then
64- rootlibs="$rootlibs -lfreetype"
65- fi
66 auxcflags="${cxxversionflag} -m64"
67 auxldflags="-m64"
68 auxlibs="-lm -ldl"
69@@ -378,18 +372,11 @@ freebsd* | openbsd* | linux*)
70 done
71 ;;
72 macosx*)
73- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then
74 auxcflags="-pthread $auxcflags"
75 auxlibs="-lpthread $auxlibs"
76- else
77- auxcflags="-D_REENTRANT $auxcflags"
78- auxlibs="-lpthread $auxlibs"
79- fi
80 for f in $features ; do
81 if test "x$f" = "xrpath" ; then
82- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then
83 auxlibs="-Wl,-rpath,$libdir $auxlibs"
84- fi
85 fi
86 if test "x$f" = "xlibcxx" ; then
87 auxcflags="-stdlib=libc++ $auxcflags"