-
- Downloads
Merge branch 'multipythonTests' into 'develop2'
The unit and functional tests, as well as the example tests, can be built for _all_ Python versions; i.e., the main version and the Python versions set via `BORNAGAIN_PYTHON_PACKAGE_VERSIONS` variable. The tests for the extra Python versions are built by setting the variable `BORNAGAIN_PYTHON_PACKAGE_TESTS=ON`. * A `tests` subfolder is added to the main binary directory to to store the built tests for the _main_ version and their output. * A `tests` subfolder is added to the build directory for Python packages to store the built tests and their output. * Adapted unit and functional tests for multiple Python versions. __NOTE:__ - `Functional/PyEmbedded` test still cannot be performed for the Python packages, most probably due to a problem with proper usage of the Python C/API. Currently, it is produced only for the main version. - The GUI test is performed only for the main version, since the Python packages does not include a GUI. * A new CMake module `MakePythonAPI` is introduced to produce the Python interfaces to the C++ libraries. `MakePythonAPI` includes the necessary CMake code to build the Python interfaces and Python packages (via `MakeSwigLib` and `MakePythonWheel` modules). In this way, the Python-related part of the build mechanism is enclosed in `MakePythonAPI`. * Differentiated between `BORNAGAIN_PYTHON` variable and `WITH_PYTHON_API` argument: * `BORNAGAIN_PYTHON` = Add Python-related functionality to the C++ libraries. * `WITH_PYTHON_API` = Add a Python interface to the C++ libraries; currently made with SWIG. * Adapted `CMakeLists.txt` for all modules (`Base`, `Fit`, etc.) to the new interface of `MakeSharedLib`. * GUI: * `SampleListView`: Added proper preprocessor guards for `BORNAGAIN_PYTHON`. * Improved and cleaned up `CMakeLists.txt`. * Test: Minor improvements. See merge request !593
No related branches found
No related tags found
Showing
- Base/CMakeLists.txt 9 additions, 3 deletionsBase/CMakeLists.txt
- CMakeLists.txt 2 additions, 0 deletionsCMakeLists.txt
- Core/CMakeLists.txt 8 additions, 1 deletionCore/CMakeLists.txt
- Device/CMakeLists.txt 9 additions, 3 deletionsDevice/CMakeLists.txt
- Fit/CMakeLists.txt 8 additions, 1 deletionFit/CMakeLists.txt
- Fit/Test/Functional/CMakeLists.txt 50 additions, 6 deletionsFit/Test/Functional/CMakeLists.txt
- Fit/Test/Unit/CMakeLists.txt 50 additions, 5 deletionsFit/Test/Unit/CMakeLists.txt
- GUI/CMakeLists.txt 14 additions, 23 deletionsGUI/CMakeLists.txt
- GUI/View/SampleDesigner/SampleListView.cpp 2 additions, 0 deletionsGUI/View/SampleDesigner/SampleListView.cpp
- GUI/View/SampleDesigner/SampleListView.h 4 additions, 0 deletionsGUI/View/SampleDesigner/SampleListView.h
- GUI/ba3d/CMakeLists.txt 5 additions, 6 deletionsGUI/ba3d/CMakeLists.txt
- Param/CMakeLists.txt 8 additions, 2 deletionsParam/CMakeLists.txt
- Resample/CMakeLists.txt 8 additions, 2 deletionsResample/CMakeLists.txt
- Sample/CMakeLists.txt 9 additions, 3 deletionsSample/CMakeLists.txt
- Tests/Examples/CMakeLists.txt 161 additions, 109 deletionsTests/Examples/CMakeLists.txt
- Tests/Functional/Core/Consistence/CMakeLists.txt 49 additions, 7 deletionsTests/Functional/Core/Consistence/CMakeLists.txt
- Tests/Functional/Core/CoreSpecial/CMakeLists.txt 52 additions, 10 deletionsTests/Functional/Core/CoreSpecial/CMakeLists.txt
- Tests/Functional/Core/Fitting/CMakeLists.txt 50 additions, 6 deletionsTests/Functional/Core/Fitting/CMakeLists.txt
- Tests/Functional/Core/Std/CMakeLists.txt 52 additions, 8 deletionsTests/Functional/Core/Std/CMakeLists.txt
- Tests/Functional/GUI/CMakeLists.txt 9 additions, 5 deletionsTests/Functional/GUI/CMakeLists.txt
Loading
Please register or sign in to comment