From 18d5c983deb57d0a8e60c6d7a66235fbba7b87fb Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Wed, 2 Jan 2019 06:08:15 -0700 Subject: [PATCH] CMake: Make Python static library names use '.' This is to be consistent with makepanda as of cedd4172c4e. --- cmake/macros/Python.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/macros/Python.cmake b/cmake/macros/Python.cmake index 6cac9001a0..1492a49e83 100644 --- a/cmake/macros/Python.cmake +++ b/cmake/macros/Python.cmake @@ -42,7 +42,6 @@ function(add_python_target target) endforeach(arg) string(REGEX REPLACE "\\.[^.]+$" "" namespace "${target}") - string(REPLACE "." "_" underscore_namespace "${namespace}") string(REPLACE "." "/" slash_namespace "${namespace}") add_library(${target} ${MODULE_TYPE} ${sources}) @@ -61,13 +60,13 @@ function(add_python_target target) else() set_target_properties(${target} PROPERTIES OUTPUT_NAME "${basename}" - PREFIX "libpython_${underscore_namespace}_") + PREFIX "libpy.${namespace}.") install(TARGETS ${target} EXPORT "${export}" COMPONENT "${component}" DESTINATION lib) endif() set(keywords OVERWRITE ARCH) - if(NOT underscore_namespace MATCHES ".*_.*") + if(NOT slash_namespace MATCHES ".*/.*") list(APPEND keywords ROOT) endif() ensure_python_init("${PROJECT_BINARY_DIR}/${slash_namespace}" ${keywords})