From 8c6e52c69111b2299c48cb0a1545b82f339412ff Mon Sep 17 00:00:00 2001
From: Julien Schueller <schueller@phimeca.com>
Date: Wed, 4 Dec 2024 08:25:12 +0100
Subject: [PATCH] CMake: Always use Python::Module

---
 CMakeLists.txt                                |   2 +-
 ...TargetLinkLibrariesWithDynamicLookup.cmake | 100 ------------------
 src/swig/CMakeLists.txt                       |   8 +-
 3 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 cmake/TargetLinkLibrariesWithDynamicLookup.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22c21f8f..ae89eac7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@
 # Benoit Scherrer, 2010 CRL, Harvard Medical School
 # Copyright (c) 2008-2009 Children's Hospital Boston
 #==============================================================================
-cmake_minimum_required (VERSION 3.14)
+cmake_minimum_required (VERSION 3.15)
 
 set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
 
diff --git a/cmake/TargetLinkLibrariesWithDynamicLookup.cmake b/cmake/TargetLinkLibrariesWithDynamicLookup.cmake
deleted file mode 100644
index 68c0aeb1..00000000
--- a/cmake/TargetLinkLibrariesWithDynamicLookup.cmake
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# - This module provides the function
-# target_link_libraries_with_dynamic_lookup which can be used to
-# "weakly" link loadable module.
-#
-# Link a library to a target such that the symbols are resolved at
-# run-time not link-time. This should be used when compiling a
-# loadable module when the symbols should be resolve from the run-time
-# environment where the module is loaded, and not a specific system
-# library.
-#
-# Specifically, for OSX it uses undefined dynamic_lookup. This is
-# similar to using "-shared" on Linux where undefined symbols are
-# ignored.
-#
-# Additionally, the linker is checked to see if it supports undefined
-# symbols when linking a shared library. If it does then the library
-# is not linked when specified with this function.
-#
-# http://blog.tim-smith.us/2015/09/python-extension-modules-os-x/
-#
-
-# Function: _CheckUndefinedSymbolsAllowed
-#
-# Check if the linker allows undefined symbols for shared libraries.
-#
-# UNDEFINED_SYMBOLS_ALLOWED - true if the linker will allow
-#   undefined symbols for shared libraries
-#
-
-function(_CheckUndefinedSymbolsAllowed)
-
-  set(VARIABLE "UNDEFINED_SYMBOLS_ALLOWED")
-  set(cache_var "${VARIABLE}_hash")
-
-
-  # hash the CMAKE_FLAGS passed and check cache to know if we need to rerun
-  string(MD5 cmake_flags_hash "${CMAKE_SHARED_LINKER_FLAGS}")
-
-  if(NOT DEFINED "${cache_var}" )
-    unset("${VARIABLE}" CACHE)
-  elseif(NOT "${${cache_var}}" STREQUAL "${cmake_flags_hash}" )
-    unset("${VARIABLE}" CACHE)
-  endif()
-
-  if(NOT DEFINED "${VARIABLE}")
-    set(test_project_dir "${PROJECT_BINARY_DIR}/CMakeTmp/${VARIABLE}")
-
-    file(WRITE "${test_project_dir}/CMakeLists.txt"
-"
-cmake_minimum_required(VERSION 3.13)
-project(undefined C)
-add_library(foo SHARED \"foo.c\")
-")
-
-    file(WRITE "${test_project_dir}/foo.c"
-"
-extern int bar(void);
-int foo(void) {return bar()+1;}
-")
-
-    if(APPLE)
-      set( _rpath_arg  "-DCMAKE_MACOSX_RPATH='${CMAKE_MACOSX_RPATH}'" )
-    else()
-      set( _rpath_arg )
-    endif()
-
-    try_compile(${VARIABLE}
-      "${test_project_dir}"
-      "${test_project_dir}"
-      undefined
-      CMAKE_FLAGS
-        "-DCMAKE_SHARED_LINKER_FLAGS='${CMAKE_SHARED_LINKER_FLAGS}'"
-        ${_rpath_arg}
-      OUTPUT_VARIABLE output)
-
-    set(${cache_var} "${cmake_flags_hash}" CACHE INTERNAL  "hashed try_compile flags")
-
-    if(${VARIABLE})
-      message(STATUS "Performing Test ${VARIABLE} - Success")
-    else()
-      message(STATUS "Performing Test ${VARIABLE} - Failed")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Performing Test ${VARIABLE} failed with the following output:\n"
-        "${OUTPUT}\n")
-    endif()
-  endif()
-endfunction()
-
-_CheckUndefinedSymbolsAllowed()
-
-macro( target_link_libraries_with_dynamic_lookup target )
-  if ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
-    set_target_properties( ${target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" )
-  elseif(UNDEFINED_SYMBOLS_ALLOWED)
-    # linker allows undefined symbols, let's just not link
-  else()
-    target_link_libraries ( ${target} ${ARGN}  )
-  endif()
-endmacro()
diff --git a/src/swig/CMakeLists.txt b/src/swig/CMakeLists.txt
index 7d0c1808..b6f094cd 100644
--- a/src/swig/CMakeLists.txt
+++ b/src/swig/CMakeLists.txt
@@ -28,13 +28,7 @@ if (Python_NumPy_FOUND)
 
   target_link_libraries (nlopt_python ${nlopt_lib})
   target_link_libraries (nlopt_python Python::NumPy)
-  if (TARGET Python::Module)
-    target_link_libraries (nlopt_python Python::Module)
-  else ()
-    target_include_directories (nlopt_python PRIVATE ${Python_INCLUDE_DIRS})
-    include (TargetLinkLibrariesWithDynamicLookup)
-    target_link_libraries_with_dynamic_lookup (${nlopt_python} ${Python_LIBRARIES})
-  endif ()
+  target_link_libraries (nlopt_python Python::Module)
 
   set_target_properties (nlopt_python PROPERTIES OUTPUT_NAME nlopt)
   set_target_properties (nlopt_python PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}")