diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 1ecddf3b57..de9f641135 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -58,9 +58,7 @@ jobs: -DBUILD_PY_BINDING=ON \ -DBUILD_CSHARP_BINDING=OFF \ -DBUILD_ECAL_TESTS=ON \ - -DECAL_INCLUDE_PY_SAMPLES=OFF \ -DECAL_INSTALL_SAMPLE_SOURCES=ON \ - -DECAL_JOIN_MULTICAST_TWICE=OFF \ -DECAL_NPCAP_SUPPORT=OFF \ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \ -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \ diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 2c80e23844..29c61a580d 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -117,9 +117,7 @@ jobs: -DBUILD_STANDALONE_PY_WHEEL=OFF \ -DBUILD_CSHARP_BINDING=OFF \ -DBUILD_ECAL_TESTS=ON \ - -DECAL_INCLUDE_PY_SAMPLES=OFF \ -DECAL_INSTALL_SAMPLE_SOURCES=ON \ - -DECAL_JOIN_MULTICAST_TWICE=OFF \ -DECAL_NPCAP_SUPPORT=OFF \ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \ -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \ diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 55490c554e..59a69157e3 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -75,9 +75,7 @@ jobs: -DBUILD_PY_BINDING=OFF ^ -DBUILD_CSHARP_BINDING=OFF ^ -DBUILD_ECAL_TESTS=OFF ^ - -DECAL_INCLUDE_PY_SAMPLES=OFF ^ -DECAL_INSTALL_SAMPLE_SOURCES=OFF ^ - -DECAL_JOIN_MULTICAST_TWICE=OFF ^ -DECAL_NPCAP_SUPPORT=ON ^ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON ^ -DECAL_THIRDPARTY_BUILD_PROTOBUF=ON ^ @@ -115,9 +113,7 @@ jobs: -DBUILD_PY_BINDING=OFF ^ -DBUILD_CSHARP_BINDING=ON ^ -DBUILD_ECAL_TESTS=ON ^ - -DECAL_INCLUDE_PY_SAMPLES=OFF ^ -DECAL_INSTALL_SAMPLE_SOURCES=ON ^ - -DECAL_JOIN_MULTICAST_TWICE=OFF ^ -DECAL_NPCAP_SUPPORT=ON ^ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON ^ -DECAL_THIRDPARTY_BUILD_PROTOBUF=ON ^ diff --git a/.github/workflows/clang-tidy-review.yml b/.github/workflows/clang-tidy-review.yml index 36699b3c09..0ee377b1bb 100644 --- a/.github/workflows/clang-tidy-review.yml +++ b/.github/workflows/clang-tidy-review.yml @@ -53,9 +53,7 @@ jobs: -DBUILD_STANDALONE_PY_WHEEL=OFF \ -DBUILD_CSHARP_BINDING=OFF \ -DBUILD_ECAL_TESTS=OFF \ - -DECAL_INCLUDE_PY_SAMPLES=OFF \ -DECAL_INSTALL_SAMPLE_SOURCES=ON \ - -DECAL_JOIN_MULTICAST_TWICE=OFF \ -DECAL_NPCAP_SUPPORT=OFF \ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \ -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \ diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index a23e4ba66f..4994ad946f 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -85,9 +85,7 @@ jobs: -DBUILD_PY_BINDING=ON \ -DBUILD_CSHARP_BINDING=OFF \ -DBUILD_ECAL_TESTS=OFF \ - -DECAL_INCLUDE_PY_SAMPLES=OFF \ -DECAL_INSTALL_SAMPLE_SOURCES=OFF \ - -DECAL_JOIN_MULTICAST_TWICE=OFF \ -DECAL_NPCAP_SUPPORT=OFF \ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \ -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \ diff --git a/CMakeLists.txt b/CMakeLists.txt index f09b8fa7f3..af2f2a8fe9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,6 @@ option(BUILD_PY_BINDING "Build eCAL python binding" option(BUILD_CSHARP_BINDING "Build eCAL C# binding" OFF) option(BUILD_ECAL_TESTS "Build the eCAL google tests" OFF) -option(ECAL_INCLUDE_PY_SAMPLES "Include python language sample projects into CMake" OFF) option(ECAL_INSTALL_SAMPLE_SOURCES "Install the sources of eCAL samples" ON) option(ECAL_NPCAP_SUPPORT "Enable the eCAL Npcap Receiver (i.e. the Win10 performance fix)" OFF) @@ -123,7 +122,7 @@ set(ECAL_CORE_TRANSPORT_SHM # ----------------------- # eCAL Python configuration # ----------------------- -set(ECAL_PYTHON_BUILD_SAMPLES ${BUILD_SAMPLES}) +#set(ECAL_PYTHON_BUILD_SAMPLES ${BUILD_SAMPLES}) set(ECAL_PYTHON_BUILD_TESTS ${BUILD_ECAL_TESTS}) set(ECAL_PYTHON_HAS_HDF5 ${HAS_HDF5}) @@ -524,7 +523,6 @@ message(STATUS "BUILD_TIME : ${BUILD_TIME}") message(STATUS "BUILD_PY_BINDING : ${BUILD_PY_BINDING}") message(STATUS "BUILD_CSHARP_BINDING : ${BUILD_CSHARP_BINDING}") message(STATUS "BUILD_ECAL_TESTS : ${BUILD_ECAL_TESTS}") -message(STATUS "ECAL_INCLUDE_PY_SAMPLES : ${ECAL_INCLUDE_PY_SAMPLES}") message(STATUS "ECAL_INSTALL_SAMPLE_SOURCES : ${ECAL_INSTALL_SAMPLE_SOURCES}") message(STATUS "ECAL_NPCAP_SUPPORT : ${ECAL_NPCAP_SUPPORT}") message(STATUS "ECAL_THIRDPARTY_BUILD_ASIO : ${ECAL_THIRDPARTY_BUILD_ASIO}") diff --git a/build_win/win_make_cmake.bat b/build_win/win_make_cmake.bat index d3d7c9d121..353d3cc02c 100644 --- a/build_win/win_make_cmake.bat +++ b/build_win/win_make_cmake.bat @@ -15,15 +15,13 @@ set CMAKE_OPTIONS_COMPLETE=-DCMAKE_INSTALL_PREFIX=_install ^ -DBUILD_APPS=ON ^ -DBUILD_SAMPLES=ON ^ -DBUILD_TIME=ON ^ --DBUILD_PY_BINDING=ON ^ +-DBUILD_PY_BINDING=OFF ^ -DBUILD_CSHARP_BINDING=ON ^ -DBUILD_ECAL_TESTS=ON ^ --DECAL_INCLUDE_PY_SAMPLES=OFF ^ -DECAL_INSTALL_SAMPLE_SOURCES=ON ^ -DECAL_NPCAP_SUPPORT=ON ^ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON ^ -DECAL_THIRDPARTY_BUILD_PROTOBUF=ON ^ --DECAL_THIRDPARTY_BUILD_SPDLOG=ON ^ -DECAL_THIRDPARTY_BUILD_TINYXML2=ON ^ -DECAL_THIRDPARTY_BUILD_FINEFTP=ON ^ -DECAL_THIRDPARTY_BUILD_CURL=ON ^ @@ -51,12 +49,10 @@ set CMAKE_OPTIONS_SDK=-DCMAKE_INSTALL_PREFIX=_install ^ -DBUILD_PY_BINDING=OFF ^ -DBUILD_CSHARP_BINDING=OFF ^ -DBUILD_ECAL_TESTS=OFF ^ --DECAL_INCLUDE_PY_SAMPLES=OFF ^ -DECAL_INSTALL_SAMPLE_SOURCES=OFF ^ -DECAL_NPCAP_SUPPORT=ON ^ -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON ^ -DECAL_THIRDPARTY_BUILD_PROTOBUF=ON ^ --DECAL_THIRDPARTY_BUILD_SPDLOG=ON ^ -DECAL_THIRDPARTY_BUILD_TINYXML2=ON ^ -DECAL_THIRDPARTY_BUILD_FINEFTP=OFF ^ -DECAL_THIRDPARTY_BUILD_CURL=OFF ^ diff --git a/build_win/win_make_python_wheel.bat b/build_win/win_make_python_wheel.bat index 743abf3985..13655dfc7c 100644 --- a/build_win/win_make_python_wheel.bat +++ b/build_win/win_make_python_wheel.bat @@ -6,6 +6,6 @@ call build_win\win_set_vars.bat cd /d %BUILD_DIR_COMPLETE% -cmake --build . --target create_python_wheel --config Release +python -m build popd diff --git a/doc/rst/development/building_ecal_from_source.rst b/doc/rst/development/building_ecal_from_source.rst index acaeebd58a..5199c5c23a 100644 --- a/doc/rst/development/building_ecal_from_source.rst +++ b/doc/rst/development/building_ecal_from_source.rst @@ -87,7 +87,7 @@ First check out the eCAL repository and all of the submodules: rem Replace with your Qt installation path: set "CMAKE_PREFIX_PATH=C:/Qt/5.15.2/msvc2019_64" - cmake ../.. -A x64 -DCMAKE_INSTALL_PREFIX=_install -DBUILD_SHARED_LIBS=OFF + cmake ../.. -A x64 -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake -DCMAKE_INSTALL_PREFIX=_install -DBUILD_SHARED_LIBS=OFF cmake --build . --parallel --config Release This will create a :file:`_build\\complete\\` directory in your eCAL root folder and build eCAL there. @@ -151,7 +151,7 @@ We support building on currently supported Ubuntu LTS releases. mkdir _build cd _build - cmake .. -DCMAKE_BUILD_TYPE=Release -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF -DECAL_THIRDPARTY_BUILD_CURL=OFF -DECAL_THIRDPARTY_BUILD_HDF5=OFF -DECAL_THIRDPARTY_BUILD_QWT=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF -DECAL_THIRDPARTY_BUILD_CURL=OFF -DECAL_THIRDPARTY_BUILD_HDF5=OFF -DECAL_THIRDPARTY_BUILD_QWT=OFF make -j4 #. Create a debian package and install it: diff --git a/doc/rst/development/ecal_cmake_options.rst b/doc/rst/development/ecal_cmake_options.rst index a477f26f2f..cadb5fa213 100644 --- a/doc/rst/development/ecal_cmake_options.rst +++ b/doc/rst/development/ecal_cmake_options.rst @@ -49,8 +49,6 @@ All options can be passed on the command line cmake ``-D