Mac OS X cleaning

sloriot · Oct 10, 2024 · 1c50e0b · 1c50e0b
1 parent 3deebce
commit 1c50e0b
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 213 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -58,7 +58,6 @@ Scripts/developer_scripts/check_svn_keywords text eol=lf
 Scripts/developer_scripts/create_cgal_test text eol=lf
 Scripts/developer_scripts/create_cgal_test_with_cmake text eol=lf
 Scripts/developer_scripts/create_internal_release text eol=lf
-Scripts/developer_scripts/create_macosx_installer text eol=lf
 Scripts/developer_scripts/create_new_release text eol=lf
 Scripts/developer_scripts/detect_files_with_mixed_eol_styles text eol=lf
 Scripts/developer_scripts/detect_packages_licenses text eol=lf

diff --git a/.gitignore b/.gitignore
@@ -1058,7 +1058,7 @@ cmake_install.cmake
 *~
 .#*
 
-# MacOS file https://en.wikipedia.org/wiki/.DS_Store
+# macOS file https://en.wikipedia.org/wiki/.DS_Store
 .DS_Store
 
 # Binaries:

diff --git a/Documentation/doc/Documentation/Third_party.txt b/Documentation/doc/Documentation/Third_party.txt
@@ -15,7 +15,7 @@ supporting C++17 or later.
 |                  | `Clang` \cgalFootnote{<A HREF="https://clang.llvm.org/">\cgalFootnoteCode{https://clang.llvm.org/}</A>} compiler version 15.0.7 |
 | \ms Windows      | \gnu `g++` 11.4.0 or later\cgalFootnote{<A HREF="https://gcc.gnu.org/">\cgalFootnoteCode{https://gcc.gnu.org/}</A>} |
 |                  | \ms Visual `C++` 15.9, 16.10, 17.0 (\visualstudio 2017, 2019, and 2022)\cgalFootnote{<A HREF="https://visualstudio.microsoft.com/">\cgalFootnoteCode{https://visualstudio.microsoft.com/}</A>} |
-| MacOS X          | \gnu `g++` 11.4.0 or later\cgalFootnote{<A HREF="https://gcc.gnu.org/">\cgalFootnoteCode{https://gcc.gnu.org/}</A>} |
+| macOS            | \gnu `g++` 11.4.0 or later\cgalFootnote{<A HREF="https://gcc.gnu.org/">\cgalFootnoteCode{https://gcc.gnu.org/}</A>} |
 |                  | Apple `Clang` compiler versions 10.0.1, 12.0.5, and 15.0.0 |
 
 <!-- Windows supported version are also listed on windows.html (must change both) -->

diff --git a/Installation/cmake/modules/FindCORE.cmake b/Installation/cmake/modules/FindCORE.cmake
@@ -3,8 +3,6 @@
 # CORE_INCLUDE_DIR - the CORE include directory
 # CORE_LIBRARIES - Libraries needed to use CORE
 
-# TODO: support Windows and MacOSX
-
 # CORE needs GMP
 include(FindPackageHandleStandardArgs)
 
@@ -17,7 +15,7 @@ if(GMP_FOUND)
   find_path(CORE_INCLUDE_DIR NAMES CORE.h DOC "The directory containing the CORE include files")
 
   find_library(CORE_LIBRARIES NAMES core++ DOC "Path to the core++ library")
-  
+
   get_filename_component(CORE_LIBRARIES_DIR ${CORE_LIBRARIES} PATH)
 
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(CORE "DEFAULT_MSG" CORE_LIBRARIES CORE_INCLUDE_DIR )

diff --git a/Installation/cmake/modules/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake
@@ -5,8 +5,6 @@
 #  GMP_LIBRARIES_DIR     - directory where the GMP libraries are located
 #  GMP_LIBRARIES         - Link these to use GMP
 
-# TODO: support MacOSX
-
 include(FindPackageHandleStandardArgs)
 include(${CMAKE_CURRENT_LIST_DIR}/CGAL_GeneratorSpecificSettings.cmake)
 

diff --git a/Installation/cmake/modules/FindGMPXX.cmake b/Installation/cmake/modules/FindGMPXX.cmake
@@ -4,8 +4,6 @@
 #   GMPXX_INCLUDE_DIR  - the GMPXX include directory
 #   GMPXX_LIBRARIES    - Libraries needed to use GMPXX
 
-# TODO: support Windows and MacOSX
-
 # GMPXX needs GMP
 
 find_package( GMP QUIET )

diff --git a/Installation/cmake/modules/FindMPFR.cmake b/Installation/cmake/modules/FindMPFR.cmake
@@ -4,8 +4,6 @@
 # MPFR_LIBRARIES_DIR - Directory where the MPFR libraries are located
 # MPFR_LIBRARIES - the MPFR libraries
 
-# TODO: support MacOSX
-
 include(FindPackageHandleStandardArgs)
 include(${CMAKE_CURRENT_LIST_DIR}/CGAL_GeneratorSpecificSettings.cmake)
 

diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
@@ -243,20 +243,6 @@
 #  define CGAL_SUNPRO_INITIALIZE(C)
 #endif
 
-//----------------------------------------------------------------------//
-// MacOSX specific.
-//----------------------------------------------------------------------//
-
-#ifdef __APPLE__
-#  if defined(__GNUG__) && (__GNUG__ == 4) && (__GNUC_MINOR__ == 0) \
-   && defined(__OPTIMIZE__) && !defined(CGAL_NO_WARNING_FOR_MACOSX_GCC_4_0_BUG)
-#    warning "Your configuration may exhibit run-time errors in CGAL code"
-#    warning "This appears with g++ 4.0 on MacOSX when optimizing"
-#    warning "You can disable this warning using -DCGAL_NO_WARNING_FOR_MACOSX_GCC_4_0_BUG"
-#    warning "For more information, see https://www.cgal.org/FAQ.html#mac_optimization_bug"
-#  endif
-#endif
-
 //-------------------------------------------------------------------//
 // When the global min and max are no longer defined (as macros)
 // because of NOMINMAX flag definition, we define our own global

diff --git a/MacOSX/auxiliary/cgal_app.icns b/MacOSX/auxiliary/cgal_app.icns
diff --git a/MacOSX/package_info/MacOSX/copyright b/MacOSX/package_info/MacOSX/copyright
diff --git a/MacOSX/package_info/MacOSX/description.txt b/MacOSX/package_info/MacOSX/description.txt
diff --git a/MacOSX/package_info/MacOSX/maintainer b/MacOSX/package_info/MacOSX/maintainer
diff --git a/MacOSX/scripts/cgal_make_macosx_app b/MacOSX/scripts/cgal_make_macosx_app
diff --git a/Profiling_tools/include/CGAL/Memory_sizer.h b/Profiling_tools/include/CGAL/Memory_sizer.h
@@ -15,7 +15,7 @@
 #include <CGAL/config.h>
 #include <CGAL/assertions.h>
 
-// This has only been implemented for MacOSX/Darwin, Linux and VC++ for now.
+// This has only been implemented for macOS/Darwin, Linux and VC++ for now.
 #if !defined _MSC_VER && !defined __linux__ && !defined __APPLE__
 
 #include <iostream>

diff --git a/Scripts/developer_scripts/create_macosx_installer b/Scripts/developer_scripts/create_macosx_installer
diff --git a/copyright b/copyright
@@ -69,7 +69,6 @@ R = RU Groningen
  LEDA                                    ETIMU
  Largest_empty_rect_2                    T
  Linear_cell_complex                     CNRS
- MacOSX                                  F
  Maintenance                             ETIMUG
  Manual                                  ETIMU
  Manual_tools                            EIM, Modena Software, Silicon Graphics