From 66a7a7dcefa1933effebd3ca7b72c2ee65972ff8 Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:49:00 +0100 Subject: [PATCH 1/7] windows build doc fixed --- doc/rst/development/building_ecal_from_source.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rst/development/building_ecal_from_source.rst b/doc/rst/development/building_ecal_from_source.rst index acaeebd58a..5a21b0c663 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_INSTALL_PREFIX=_install -DBUILD_SHARED_LIBS=OFF -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake cmake --build . --parallel --config Release This will create a :file:`_build\\complete\\` directory in your eCAL root folder and build eCAL there. From 9e0ab1db71cf34dac30d832542b51b9c35cb802a Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Thu, 16 Jan 2025 10:19:49 +0100 Subject: [PATCH 2/7] CMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake add for unix build too --- doc/rst/development/building_ecal_from_source.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/rst/development/building_ecal_from_source.rst b/doc/rst/development/building_ecal_from_source.rst index 5a21b0c663..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 -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake + 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: From 561a49733cdeb3057a79191b89ade3032caf79eb Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Thu, 16 Jan 2025 10:20:57 +0100 Subject: [PATCH 3/7] remove CMake flags ECAL_INCLUDE_PY_SAMPLES remove CMake logging for ECAL_THIRDPARTY_BUILD_ASIO, ECAL_THIRDPARTY_BUILD_FTXUI, ECAL_THIRDPARTY_BUILD_SPDLOG, ECAL_THIRDPARTY_BUILD_TCLAP, ECAL_THIRDPARTY_BUILD_TERMCOLOR, ECAL_THIRDPARTY_BUILD_YAML-CPP --- .github/workflows/build-macos.yml | 2 -- .github/workflows/build-ubuntu.yml | 2 -- .github/workflows/build-windows.yml | 4 ---- .github/workflows/clang-tidy-review.yml | 2 -- .github/workflows/documentation.yml | 2 -- CMakeLists.txt | 8 -------- build_win/win_make_cmake.bat | 4 ---- doc/rst/development/ecal_cmake_options.rst | 2 -- 8 files changed, 26 deletions(-) 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..a0b921596d 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) @@ -524,26 +523,19 @@ 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}") message(STATUS "ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS : ${ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS}") message(STATUS "ECAL_THIRDPARTY_BUILD_CURL : ${ECAL_THIRDPARTY_BUILD_CURL}") message(STATUS "ECAL_THIRDPARTY_BUILD_FINEFTP : ${ECAL_THIRDPARTY_BUILD_FINEFTP}") -message(STATUS "ECAL_THIRDPARTY_BUILD_FTXUI : ${ECAL_THIRDPARTY_BUILD_FTXUI}") message(STATUS "ECAL_THIRDPARTY_BUILD_GTEST : ${ECAL_THIRDPARTY_BUILD_GTEST}") message(STATUS "ECAL_THIRDPARTY_BUILD_HDF5 : ${ECAL_THIRDPARTY_BUILD_HDF5}") message(STATUS "ECAL_THIRDPARTY_BUILD_PROTOBUF : ${ECAL_THIRDPARTY_BUILD_PROTOBUF}") message(STATUS "ECAL_THIRDPARTY_BUILD_QWT : ${ECAL_THIRDPARTY_BUILD_QWT}") message(STATUS "ECAL_THIRDPARTY_BUILD_RECYCLE : ${ECAL_THIRDPARTY_BUILD_RECYCLE}") -message(STATUS "ECAL_THIRDPARTY_BUILD_SPDLOG : ${ECAL_THIRDPARTY_BUILD_SPDLOG}") -message(STATUS "ECAL_THIRDPARTY_BUILD_TCLAP : ${ECAL_THIRDPARTY_BUILD_TCLAP}") message(STATUS "ECAL_THIRDPARTY_BUILD_TCP_PUBSUB : ${ECAL_THIRDPARTY_BUILD_TCP_PUBSUB}") -message(STATUS "ECAL_THIRDPARTY_BUILD_TERMCOLOR : ${ECAL_THIRDPARTY_BUILD_TERMCOLOR}") message(STATUS "ECAL_THIRDPARTY_BUILD_TINYXML2 : ${ECAL_THIRDPARTY_BUILD_TINYXML2}") message(STATUS "ECAL_THIRDPARTY_BUILD_UDPCAP : ${ECAL_THIRDPARTY_BUILD_UDPCAP}") -message(STATUS "ECAL_THIRDPARTY_BUILD_YAML-CPP : ${ECAL_THIRDPARTY_BUILD_YAML-CPP}") message(STATUS "ECAL_LINK_HDF5_SHARED : ${ECAL_LINK_HDF5_SHARED}") message(STATUS "CPACK_PACK_WITH_INNOSETUP : ${CPACK_PACK_WITH_INNOSETUP}") message(STATUS "--------------------------------------------------------------------------------") diff --git a/build_win/win_make_cmake.bat b/build_win/win_make_cmake.bat index d3d7c9d121..bf6cf24618 100644 --- a/build_win/win_make_cmake.bat +++ b/build_win/win_make_cmake.bat @@ -18,12 +18,10 @@ set CMAKE_OPTIONS_COMPLETE=-DCMAKE_INSTALL_PREFIX=_install ^ -DBUILD_PY_BINDING=ON ^ -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/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