Skip to content

Commit

Permalink
Revert "__NO_EXTENSIONS__ typo"
Browse files Browse the repository at this point in the history
This reverts commit 8e48714.

Revert "also adding MacOS 10.6 __NOEXTENSIONS__ workaround to KLU"

This reverts commit 2951239.

Revert "CHOLMOD: Don't use macOS extensions of math library"

This reverts commit 217e228.
  • Loading branch information
mmuetzel committed Jan 3, 2024
1 parent 23f6495 commit 6562339
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 30 deletions.
13 changes: 0 additions & 13 deletions CHOLMOD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -351,13 +351,6 @@ if ( BUILD_SHARED_LIBS )
target_include_directories ( CHOLMOD
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )

if ( APPLE AND CMAKE_SYSTEM_VERSION VERSION_LESS 11 )
# Older versions of math.h on the Mac (PowerPC only) define Real and Imag,
# which conflicts the internal use of those symbols in KLU and CHOLMOD.
# This can be disabled with -D__NOEXTENSIONS__
target_compile_definitions ( CHOLMOD PRIVATE "__NOEXTENSIONS__" )
endif ( )
endif ( )

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -391,12 +384,6 @@ if ( BUILD_STATIC_LIBS )
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )

if ( APPLE AND CMAKE_SYSTEM_VERSION VERSION_LESS 11 )
# Older versions of math.h on the Mac (PowerPC only) define Real and Imag,
# which conflicts the internal use of those symbols in KLU and CHOLMOD.
# This can be disabled with -D__NOEXTENSIONS__
target_compile_definitions ( CHOLMOD_static PRIVATE "__NOEXTENSIONS__" )
endif ( )
endif ( )

#-------------------------------------------------------------------------------
Expand Down
20 changes: 3 additions & 17 deletions KLU/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,9 @@ if ( BUILD_SHARED_LIBS )
set_target_properties ( KLU PROPERTIES EXPORT_NO_SYSTEM ON )
endif ( )

target_include_directories ( KLU
target_include_directories ( KLU
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )

if ( APPLE AND CMAKE_SYSTEM_VERSION VERSION_LESS 11 )
# Older versions of math.h on the Mac (PowerPC only) define Real and Imag,
# which conflicts the internal use of those symbols in KLU and CHOLMOD.
# This can be disabled with -D__NOEXTENSIONS__
target_compile_definitions ( KLU PRIVATE "__NOEXTENSIONS__" )
endif ( )
endif ( )

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -181,13 +174,6 @@ if ( BUILD_STATIC_LIBS )
target_include_directories ( KLU_static
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )

if ( APPLE AND CMAKE_SYSTEM_VERSION VERSION_LESS 11 )
# Older versions of math.h on the Mac (PowerPC only) define Real and Imag,
# which conflicts the internal use of those symbols in KLU and CHOLMOD.
# This can be disabled with -D__NOEXTENSIONS__
target_compile_definitions ( KLU_static PRIVATE "__NOEXTENSIONS__" )
endif ( )
endif ( )

#-------------------------------------------------------------------------------
Expand All @@ -213,7 +199,7 @@ if ( KLU_HAS_CHOLMOD )
set_target_properties ( KLU_CHOLMOD PROPERTIES EXPORT_NO_SYSTEM ON )
endif ( )

target_include_directories ( KLU_CHOLMOD
target_include_directories ( KLU_CHOLMOD
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
endif ( )
Expand All @@ -236,7 +222,7 @@ if ( KLU_HAS_CHOLMOD )
set_target_properties ( KLU_CHOLMOD_static PROPERTIES EXPORT_NO_SYSTEM ON )
endif ( )

target_include_directories ( KLU_CHOLMOD_static
target_include_directories ( KLU_CHOLMOD_static
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
endif ( )
Expand Down

0 comments on commit 6562339

Please sign in to comment.