BUG: Do not link against specific Python version on OS X

Added new CMake macro sitk_target_link_libraries_with_dynamic_lookup, to help resolve symbols at load time and not link time. This macro is used to link loadable module against their language libraries to improve compatibility. This will help packaging on homebrew, as homebrew is starting to enforce the policy that libraries should not be linked to a specific python. Thanks to: Michka Popoff <michkapopoff@gmail.com> Change-Id: Idc02ecb7a567a0e8c022097ff827f51a6af2e80d
SimpleITK · Feb 9, 2016 · 8fe8a78 · 8fe8a78
1 parent 83396f9
commit 8fe8a78
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 9 deletions.
diff --git a/CMake/sitkExtras.cmake b/CMake/sitkExtras.cmake
@@ -0,0 +1,21 @@
+
+#
+# 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
+# simular to using "-shared" on Linux where undefined symbols are
+# ignored.
+#
+# http://blog.tim-smith.us/2015/09/python-extension-modules-os-x/
+#
+macro( sitk_target_link_libraries_with_dynamic_lookup target )
+  if ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+    set_target_properties( ${target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" )
+  else()
+    target_link_libraries ( ${target} ${ARGN}  )
+  endif()
+endmacro()
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,8 @@ find_package(ITK REQUIRED )
 #we require certain packages be turned on in ITK
 include(sitkCheckForITKModuleDependencies)
 
+include(sitkExtras)
+
 if(ITK_FOUND)
 
   # NOTE: We are purposely not calling UseITK yet. However, we must make

diff --git a/Wrapping/CSharp/CMakeLists.txt b/Wrapping/CSharp/CMakeLists.txt
@@ -50,7 +50,7 @@ if(DEFINED SimpleITK_VERSION_POST)
     ${CMAKE_CURRENT_SOURCE_DIR}/CSharp.i
     ${CMAKE_CURRENT_SOURCE_DIR}/CSharpTypemapHelper.i )
   swig_add_module(SimpleITKCSharpNative csharp SimpleITK.i)
-  swig_link_libraries(SimpleITKCSharpNative ${SimpleITK_LIBRARIES})
+  target_link_libraries(${SWIG_MODULE_SimpleITKCSharpNative_TARGET_NAME} ${SimpleITK_LIBRARIES})
   set_target_properties(${SWIG_MODULE_SimpleITKCSharpNative_TARGET_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CSHARP_BINARY_DIRECTORY})
   if ( UNIX )
     set_target_properties(${SWIG_MODULE_SimpleITKCSharpNative_TARGET_NAME} PROPERTIES PREFIX "lib")

diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt
@@ -21,7 +21,7 @@ set(CMAKE_SWIG_OUTDIR ${JAVA_SOURCE_DIRECTORY}/org/itk/simple/)
 set(CMAKE_SWIG_FLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -package "org.itk.simple" ${CMAKE_SWIG_GLOBAL_FLAGS})
 set(SWIG_MODULE_SimpleITKJava_EXTRA_DEPS ${SWIG_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/Java.i ${CMAKE_CURRENT_SOURCE_DIR}/JavaDoc.i)
 SWIG_add_module ( SimpleITKJava java SimpleITK.i )
-SWIG_link_libraries(SimpleITKJava ${SimpleITK_LIBRARIES})
+target_link_libraries( ${SWIG_MODULE_SimpleITKJava_TARGET_NAME} ${SimpleITK_LIBRARIES})
 set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-w")
 sitk_strip_target( ${SWIG_MODULE_SimpleITKJava_TARGET_NAME} )
 

diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt
@@ -21,11 +21,13 @@ set(SWIG_MODULE_SimpleITK_EXTRA_DEPS ${SWIG_EXTRA_DEPS}
 SWIG_add_module ( SimpleITK python
   SimpleITK.i
   sitkPyCommand.cxx )
-SWIG_link_libraries ( SimpleITK ${SimpleITK_LIBRARIES} ${PYTHON_LIBRARIES})
+set(SWIG_MODULE_SimpleITKPython_TARGET_NAME "${SWIG_MODULE_SimpleITK_TARGET_NAME}")
+target_link_libraries ( ${SWIG_MODULE_SimpleITKPython_TARGET_NAME} ${SimpleITK_LIBRARIES} )
+sitk_target_link_libraries_with_dynamic_lookup( ${SWIG_MODULE_SimpleITKPython_TARGET_NAME} ${PYTHON_LIBRARIES} )
 set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-w")
-sitk_strip_target( ${SWIG_MODULE_SimpleITK_TARGET_NAME} )
+sitk_strip_target( ${SWIG_MODULE_SimpleITKPython_TARGET_NAME} )
+
 
-set(SWIG_MODULE_SimpleITKPython_TARGET_NAME "${SWIG_MODULE_SimpleITK_TARGET_NAME}")
 
 # Installation
 set( SIMPLEITK_PYTHON_PACKAGE_DIR "${SimpleITK_BINARY_DIR}/Wrapping/Python" )

diff --git a/Wrapping/R/CMakeLists.txt b/Wrapping/R/CMakeLists.txt
@@ -8,11 +8,11 @@ set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_GLOBAL_FLAGS})
 set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(SWIG_MODULE_SimpleITK_EXTRA_DEPS ${SWIG_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/R.i )
 SWIG_add_module ( SimpleITK r SimpleITK.i sitkRCommand.cxx )
-SWIG_link_libraries ( SimpleITK ${SimpleITK_LIBRARIES} )
+target_link_libraries ( ${SWIG_MODULE_SimpleITK_TARGET_NAME} ${SimpleITK_LIBRARIES} )
 
 # on some platforms the r libraries are not required at link time...
 if(R_LIBRARIES)
-  SWIG_link_libraries ( SimpleITK ${R_LIBRARIES} )
+  sitk_target_link_libraries_with_dynamic_lookup ( ${SWIG_MODULE_SimpleITK_TARGET_NAME} ${R_LIBRARIES} )
 endif()
 
 set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-w")

diff --git a/Wrapping/Ruby/CMakeLists.txt b/Wrapping/Ruby/CMakeLists.txt
@@ -11,6 +11,7 @@ set(SWIG_MODULE_simpleitk_EXTRA_DEPS ${SWIG_EXTRA_DEPS}
   ${CMAKE_CURRENT_SOURCE_DIR}/Ruby.i)
 
 SWIG_add_module( simpleitk ruby SimpleITK.i  )
-SWIG_link_libraries( simpleitk ${SimpleITK_LIBRARIES} ${RUBY_LIBRARY})
+target_link_libraries( ${SWIG_MODULE_simpleitk_TARGET_NAME} ${SimpleITK_LIBRARIES} )
+sitk_target_link_libraries_with_dynamic_lookup( ${SWIG_MODULE_simpleitk_TARGET_NAME} ${RUBY_LIBRARY} )
 set_source_files_properties( ${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-w")
 sitk_strip_target( ${SWIG_MODULE_simpleitk_TARGET_NAME} )
diff --git a/Wrapping/Tcl/CMakeLists.txt b/Wrapping/Tcl/CMakeLists.txt
@@ -10,7 +10,8 @@ set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(SWIG_MODULE_SimpleITKTCL_EXTRA_DEPS ${SWIG_EXTRA_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/Tcl.i )
 set(SWIG_MODULE_SimpleITKTcl_EXTRA_DEPS  ${SWIG_MODULE_SimpleITKTCL_EXTRA_DEPS})
 #  SWIG_add_module ( SimpleITKTcl tcl SimpleITK.i SimpleITKTCL_wrap.cxx )
-#  SWIG_link_libraries ( SimpleITKTcl ${SimpleITK_LIBRARIES} ${TCL_LIBRARY})
+#  target_link_libraries ( ${SWIG_MODULE_SimpleITKTcl_TARGET_NAME} ${SimpleITK_LIBRARIES} )
+#  sitk_target_link_libraries_with_dynamic_lookup( ${SWIG_MODULE_SimpleITKTcl_TARGET_NAME} ${TCL_LIBRARY} )
 #  set_source_files_properties(${swig_generated_file_fullname}  PROPERTIES COMPILE_FLAGS "-w")
 #  add_executable ( SimpleITKTclsh ${swig_generated_file_fullname} )
 #  target_link_libraries ( SimpleITKTclsh ${SimpleITK_LIBRARIES} ${TCL_LIBRARY})