Browse Source

python: don't generate corrade/__init__.py to two different locations.

Causes problems when running tests with multi-config (Ninja) builds, as
the corrade module is then attempted to be imported from a directory
where __init__.py is, but not the actual binaries.
next
Vladimír Vondruš 2 years ago
parent
commit
e5e7824b96
  1. 5
      src/python/corrade/CMakeLists.txt

5
src/python/corrade/CMakeLists.txt

@ -112,7 +112,7 @@ else()
set(_MAGNUM_BUILD_PYTHON_BINDINGS_RTLD_GLOBAL "## ") set(_MAGNUM_BUILD_PYTHON_BINDINGS_RTLD_GLOBAL "## ")
endif() endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in
${CMAKE_CURRENT_BINARY_DIR}/__init__.py) ${output_dir}/corrade/__init__.py)
pybind11_add_module(corrade ${pybind11_add_module_SYSTEM} ${corrade_SRCS}) pybind11_add_module(corrade ${pybind11_add_module_SYSTEM} ${corrade_SRCS})
target_include_directories(corrade PRIVATE target_include_directories(corrade PRIVATE
@ -124,9 +124,6 @@ set_target_properties(corrade PROPERTIES
OUTPUT_NAME "_corrade" OUTPUT_NAME "_corrade"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}) LIBRARY_OUTPUT_DIRECTORY ${output_dir})
file(GENERATE OUTPUT ${output_dir}/corrade/__init__.py
INPUT ${CMAKE_CURRENT_BINARY_DIR}/__init__.py)
if(MAGNUM_BUILD_TESTS) if(MAGNUM_BUILD_TESTS)
add_subdirectory(test) add_subdirectory(test)
endif() endif()

Loading…
Cancel
Save