[j.0] minor cleanup ()

Merging branch 'j.0'  into 'main'.

See merge request !2494

cmake/configurables/FixPack.cmake.in

@@ -6,14 +6,14 @@
 set(APPLE "@APPLE@")
 set(WIN32 "@WIN32@")
 set(LINUX "@LINUX@")
+
 # package root directory will be set by CPack during package build phase
 set(pkg_root "${CMAKE_INSTALL_PREFIX}")
 
-set(_wheeldir "@WHEEL_DIR@")
 if(LINUX)
-    # correct wheel directory as the wheels should be
-    # further repaired via `auditwheel` (PEP 599)
     set(_wheeldir "@WHEEL_DIR@/manylinux")
+else()
+    set(_wheeldir "@WHEEL_DIR@")
 endif()
 
 function(addPyWheel dst)
@@ -25,13 +25,15 @@ endfunction(addPyWheel)
 
 if(LINUX)
     addPyWheel("${pkg_root}/@destination_pypackage@")
-    execute_process(COMMAND bash
-        "@BUILD_VAR_DIR@/adjust_pkg_linux.sh" "${pkg_root}")
+    execute_process(COMMAND bash "@BUILD_VAR_DIR@/adjust_pkg_linux.sh" "${pkg_root}")
+
 elseif(APPLE)
     addPyWheel("${pkg_root}/@destination_pypackage@")
     message("FixPack: @Python3_EXECUTABLE@ '@BUILD_VAR_DIR@/mac_package.py' '${pkg_root}/@destination_root@'")
     execute_process(COMMAND "@Python3_EXECUTABLE@" "@BUILD_VAR_DIR@/mac_package.py"
         "${pkg_root}/@destination_root@")
+
 elseif(WIN32)
     addPyWheel("${pkg_root}/@destination_pypackage@")
+
 endif()

devtools/deploy/mac/mac_package.py.in

@@ -867,6 +867,7 @@ for dst, lib in pkg.dst_tbl.items():
 #-- apply RPATHs
 print("\n%s: Add proper RPATHs to the binaries..." % TITLE)
 for lib in pkg.dst_tbl.values():
+    print(f"... lib {lib} has rpaths {lib.rpaths}.")
     # eg. RPATHS for 'lib/libA.dylib': ../Library , ../Frameworks/Qt
     # eg. install_name_tool libA.so -add_rpath RPATH1 -add_rpath RPATH2 ...
     _cmd_list = []