@@ -4,7 +4,11 @@ include(CMakeParseArguments)
4
4
include (darling_bundle)
5
5
6
6
function (build_pybundle name )
7
- cmake_parse_arguments (BUNDLE "FAT" "PYTHON_VERSION;DESTINATION" "SOURCES" ${ARGN} )
7
+ cmake_parse_arguments (BUNDLE "FAT" "PYTHON_VERSION;DESTINATION;OUTPUT_NAME" "SOURCES;DEPENDS" ${ARGN} )
8
+
9
+ if (NOT BUNDLE_OUTPUT_NAME )
10
+ set (BUNDLE_OUTPUT_NAME "${name} " )
11
+ endif ()
8
12
9
13
# Apple has removed Python 2.6 support, so disable this codepath
10
14
#
@@ -33,18 +37,21 @@ function(build_pybundle name)
33
37
message (FATAL_ERROR "Unknown Python version set: ${BUNDLE_PYTHON_VERSION} " )
34
38
endif ()
35
39
36
- set (full_name "${name} _ ${suffix} " )
40
+ set (full_name "${name}${suffix} " )
37
41
add_darling_bundle("${full_name} " "" ${BUNDLE_SOURCES} )
38
42
39
43
if (BUNDLE_FAT)
40
44
make_fat("${full_name} " )
41
45
endif (BUNDLE_FAT)
42
46
43
- set_property (TARGET "${full_name} " APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-flat_namespace -Wl,- undefined,suppress " )
47
+ set_property (TARGET "${full_name} " APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-undefined,dynamic_lookup " )
44
48
45
- target_link_libraries ("${full_name} " system )
46
- install (TARGETS "${full_name} " DESTINATION "${BUNDLE_DESTINATION} " )
47
- install (CODE "execute_process(COMMAND mv ${full_name} ${name} .so WORKING_DIRECTORY ${BUNDLE_DESTINATION} )" )
49
+ target_link_libraries ("${full_name} " system "${BUNDLE_DEPENDS} " )
50
+ install (
51
+ PROGRAMS "$<TARGET_FILE:${full_name} >"
52
+ DESTINATION "${BUNDLE_DESTINATION} "
53
+ RENAME "${BUNDLE_OUTPUT_NAME} .so"
54
+ )
48
55
endfunction (build_pybundle)
49
56
50
57
function (easyinstall python_version package_name package_version )
0 commit comments