diff --git a/CMakeLists.txt b/CMakeLists.txt index 7edcb79f1d..f31289ea8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1102,19 +1102,19 @@ if(openPMD_BUILD_TESTING) ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) if(WIN32) - string(REGEX REPLACE "/" "\\\\" WIN_BUILD_BASEDIR ${openPMD_BINARY_DIR}) + string(REGEX REPLACE "/" "\\\\" WIN_BUILD_PYDIR ${CMAKE_PYTHON_OUTPUT_DIRECTORY}) string(REGEX REPLACE "/" "\\\\" WIN_BUILD_BINDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) string(REPLACE ";" "\\;" WIN_PATH "$ENV{PATH}") string(REPLACE ";" "\\;" WIN_PYTHONPATH "$ENV{PYTHONPATH}") set_property(TEST Unittest.py PROPERTY ENVIRONMENT "PATH=${WIN_BUILD_BINDIR}\\${CMAKE_BUILD_TYPE}\;${WIN_PATH}\n" - "PYTHONPATH=${WIN_BUILD_BASEDIR}\\${CMAKE_INSTALL_PYTHONDIR}\\${CMAKE_BUILD_TYPE}\;${WIN_PYTHONPATH}" + "PYTHONPATH=${WIN_BUILD_PYDIR}\;${WIN_PYTHONPATH}" ) else() set_tests_properties(Unittest.py PROPERTIES ENVIRONMENT - "PYTHONPATH=${openPMD_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}:$ENV{PYTHONPATH}" + "PYTHONPATH=${CMAKE_PYTHON_OUTPUT_DIRECTORY}:$ENV{PYTHONPATH}" ) endif() endif() @@ -1172,15 +1172,19 @@ if(openPMD_BUILD_TESTING) function(test_set_pythonpath test_name) if(WIN32) + string(REGEX REPLACE "/" "\\\\" WIN_BUILD_PYDIR ${CMAKE_PYTHON_OUTPUT_DIRECTORY}) + string(REGEX REPLACE "/" "\\\\" WIN_BUILD_BINDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + string(REPLACE ";" "\\;" WIN_PATH "$ENV{PATH}") + string(REPLACE ";" "\\;" WIN_PYTHONPATH "$ENV{PYTHONPATH}") set_property(TEST ${test_name} PROPERTY ENVIRONMENT "PATH=${WIN_BUILD_BINDIR}\\${CMAKE_BUILD_TYPE}\;${WIN_PATH}\n" - "PYTHONPATH=${WIN_BUILD_BASEDIR}\\${CMAKE_INSTALL_PYTHONDIR}\\${CMAKE_BUILD_TYPE}\;${WIN_PYTHONPATH}" + "PYTHONPATH=${WIN_BUILD_PYDIR}\;${WIN_PYTHONPATH}" ) else() set_tests_properties(${test_name} PROPERTIES ENVIRONMENT - "PYTHONPATH=${openPMD_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}:$ENV{PYTHONPATH}" + "PYTHONPATH=${CMAKE_PYTHON_OUTPUT_DIRECTORY}:$ENV{PYTHONPATH}" ) endif() endfunction() @@ -1301,19 +1305,19 @@ if(openPMD_BUILD_TESTING) ) endif() if(WIN32) - string(REGEX REPLACE "/" "\\\\" WIN_BUILD_BASEDIR ${openPMD_BINARY_DIR}) + string(REGEX REPLACE "/" "\\\\" WIN_BUILD_PYDIR ${CMAKE_PYTHON_OUTPUT_DIRECTORY}) string(REGEX REPLACE "/" "\\\\" WIN_BUILD_BINDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) string(REPLACE ";" "\\;" WIN_PATH "$ENV{PATH}") string(REPLACE ";" "\\;" WIN_PYTHONPATH "$ENV{PYTHONPATH}") set_property(TEST Example.py.${examplename} PROPERTY ENVIRONMENT "PATH=${WIN_BUILD_BINDIR}\\${CMAKE_BUILD_TYPE}\;${WIN_PATH}\n" - "PYTHONPATH=${WIN_BUILD_BASEDIR}\\${CMAKE_INSTALL_PYTHONDIR}\\${CMAKE_BUILD_TYPE}\;${WIN_PYTHONPATH}" + "PYTHONPATH=${WIN_BUILD_PYDIR}\;${WIN_PYTHONPATH}" ) else() set_tests_properties(Example.py.${examplename} PROPERTIES ENVIRONMENT - "PYTHONPATH=${openPMD_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}:$ENV{PYTHONPATH}" + "PYTHONPATH=${CMAKE_PYTHON_OUTPUT_DIRECTORY}:$ENV{PYTHONPATH}" ) endif() endif() @@ -1334,6 +1338,15 @@ message(" C++ Compiler: ${CMAKE_CXX_COMPILER_ID} " "${CMAKE_CXX_COMPILER_WRAPPER}") message(" ${CMAKE_CXX_COMPILER}") message("") +message(" Build prefix: ${openPMD_BINARY_DIR}") +message(" bin: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") +message(" lib: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") +#message(" include: ...") +#message(" cmake: ...") +if(openPMD_HAVE_PYTHON) + message(" python: ${CMAKE_PYTHON_OUTPUT_DIRECTORY}") +endif() +message("") if(openPMD_INSTALL) message(" Installation prefix: ${CMAKE_INSTALL_PREFIX}") message(" bin: ${CMAKE_INSTALL_BINDIR}")