Skip to content

Commit 31e3c42

Browse files
authored
CMake: Fix Python Install Directory (#1393)
Fix regressions in 0.15.0 that showed up during packaging.
1 parent 102e907 commit 31e3c42

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ if(openPMD_HAVE_ADIOS1)
680680
COMPILE_PDB_NAME_${CFG_UPPER} openPMD.ADIOS1.Serial
681681
ARCHIVE_OUTPUT_DIRECTORY_${CFG_UPPER} ${openPMD_ARCHIVE_OUTPUT_DIRECTORY}/${CFG}
682682
LIBRARY_OUTPUT_DIRECTORY_${CFG_UPPER} ${openPMD_LIBRARY_OUTPUT_DIRECTORY}/${CFG}
683-
RUNTIME_OUTPUT_DIRECTORY_${CFG_UPPER} ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/${CFG}
683+
RUNTIME_OUTPUT_DIRECTORY_${CFG_UPPER} ${openPMD_RUNTIME_OUTPUT_DIRECTORY}/${CFG}
684684
PDB_OUTPUT_DIRECTORY_${CFG_UPPER} ${openPMD_PDB_OUTPUT_DIRECTORY}/${CFG}
685685
COMPILE_PDB_OUTPUT_DIRECTORY_${CFG_UPPER} ${openPMD_COMPILE_PDB_OUTPUT_DIRECTORY}/${CFG}
686686
)
@@ -875,10 +875,10 @@ if(openPMD_HAVE_PYTHON)
875875
"${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages"
876876
)
877877
endif()
878-
# Location for installed python package
879-
set(openPMD_INSTALL_PYTHONDIR "${openPMD_INSTALL_PYTHONDIR_DEFAULT}")
880-
# Build directory for python modules
881-
set(openPMD_PYTHON_OUTPUT_DIRECTORY "${openPMD_BINARY_DIR}/${openPMD_INSTALL_PYTHONDIR}")
878+
set(openPMD_INSTALL_PYTHONDIR "${openPMD_INSTALL_PYTHONDIR_DEFAULT}"
879+
CACHE STRING "Location for installed python package")
880+
set(openPMD_PYTHON_OUTPUT_DIRECTORY "${openPMD_BINARY_DIR}/${openPMD_INSTALL_PYTHONDIR}"
881+
CACHE STRING "Build directory for python modules")
882882
set_target_properties(openPMD.py PROPERTIES
883883
ARCHIVE_OUTPUT_NAME openpmd_api_cxx
884884
LIBRARY_OUTPUT_NAME openpmd_api_cxx

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def build_extension(self, ext):
4747
'-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' +
4848
os.path.join(extdir, "openpmd_api"),
4949
# '-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=' + extdir,
50-
'-DCMAKE_PYTHON_OUTPUT_DIRECTORY=' + extdir,
50+
'-DopenPMD_PYTHON_OUTPUT_DIRECTORY=' + extdir,
5151
'-DPython_EXECUTABLE=' + sys.executable,
5252
'-DopenPMD_USE_PYTHON:BOOL=ON',
5353
# variants

0 commit comments

Comments
 (0)